[arch-commits] Commit in filesystem/trunk (6 files)

[Pierre Schmitz]

    Date: Tuesday, July 8, 2008 @ 15:16:06
  Author: pierre
Revision: 4675

added http user and group (for use by various webserver releated packages)
added scanner group
use /srv instead of /home for http and ftp

Modified:
  filesystem/trunk/PKGBUILD
  filesystem/trunk/filesystem.install
  filesystem/trunk/group
  filesystem/trunk/gshadow
  filesystem/trunk/passwd
  filesystem/trunk/shadow

--------------------+
 PKGBUILD           |   26 ++++++++++++++------------
 filesystem.install |   16 ++++++++++++++--
 group              |    2 ++
 gshadow            |    2 ++
 passwd             |    3 ++-
 shadow             |    1 +
 6 files changed, 35 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-08 17:47:45 UTC (rev 4674)
+++ PKGBUILD	2008-07-08 19:16:06 UTC (rev 4675)
@@ -3,8 +3,8 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=filesystem
-pkgver=2008.06
-pkgrel=2
+pkgver=2008.07
+pkgrel=1
 pkgdesc="Base filesystem"
 arch=(i686 x86_64)
 license=('GPL')
@@ -41,11 +41,13 @@
   (cd $startdir/pkg/usr; ln -s ../var var)
   (cd $startdir/pkg/var; ln -s spool/mail mail)
 
-  # vsftpd won't run with write perms on /home/ftp
-  mkdir -p home/ftp
-  chown root.ftp home/ftp
-  chmod 555 home/ftp
+  # vsftpd won't run with write perms on /srv/ftp
+  mkdir -p srv/ftp
+  chown root.ftp srv/ftp
+  chmod 555 srv/ftp
 
+  install -d -o root -g root -m 755 srv/http
+
   chmod 1777 var/spool/mail tmp var/tmp
   chmod 0750 root
 
@@ -63,26 +65,26 @@
 
   # no version any more
   #cat issue | sed "s/#VERSION#/$pkgver/" >$startdir/pkg/etc/issue
-  
+
   # re-add /etc/arch-release, some software uses it
   # to check whether arch is running
   touch $startdir/pkg/etc/arch-release
 }
-md5sums=('20354fa6fc7a1a98fdc30b201bc5ac21'
-         'cda2226890afb19e6bba62ae60716636'
+md5sums=('f64f86c4a6356961b69ead0471294145'
+         '1bdc5dba66947d74866a5df8ce9ef3b1'
          '775464ba7588b4976e0c2a02b83123f4'
          '655071da46d2ac03e0fb8a071bf193ea'
          'f28150d4c0b22a017be51b9f7f9977ed'
          '2c24792d97ef3cf0d73b60d4c429730b'
-         '4eee5140437e09821e82d689f53439b3'
-         'c163cae617cbae36d1eb5546bdb59bcb'
+         '8a9042a2cedf6b6b47eb8973f14289cb'
+         '019e5c24f9befef395a28e7ef2e4e5b9'
          '4e2f238bae5cbf716ff73c9404404269'
          'e5d8323a4dbee7a6d0d2a19cbf4b819f'
          '81b3cb42a6ddabc2ed2310511ee9c859'
          'd41d8cd98f00b204e9800998ecf8427e'
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '40dac0de4c6b99c8ca97effbd7527c84'
-         'ffdf350b692604518c3c37248e7009ff'
+         'ab9c2a40eba287b2918589ab8e0b2fbf'
          'f436d2e0ed02b7b73bd10c6693e95ac3'
          '65d78e621ed69eed69f854c3ee2e5942'
          'f2a88eacb5c37201368c916d9e594440')

Modified: filesystem.install
===================================================================
--- filesystem.install	2008-07-08 17:47:45 UTC (rev 4674)
+++ filesystem.install	2008-07-08 19:16:06 UTC (rev 4675)
@@ -4,7 +4,7 @@
   [ -f var/log/wtmp ]    ||  : >var/log/wtmp
   [ -f var/run/utmp ]    ||  : >var/run/utmp
   [ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
-  # workaround for bug #7194   
+  # workaround for bug #7194
   # readded due to bug #9465
   # please do not remove!
   chmod 1777 var/spool/mail tmp var/tmp var/lock
@@ -42,7 +42,19 @@
     usr/sbin/groupadd -g 50 games >/dev/null
   fi
   if [ ! "`grep ^uucp: etc/group`" ]; then
-    echo "adding new group: games"
+    echo "adding new group: uucp"
     usr/sbin/groupadd -g 14 uucp >/dev/null
   fi
+  if [ ! "`grep ^http: etc/group`" ]; then
+    echo "adding new group: http"
+    usr/sbin/groupadd -g 33 http >/dev/null
+  fi
+  if [ ! "`grep ^http: etc/passwd`" ]; then
+    echo "adding new user http"
+    usr/sbin/useradd -u 33 -d /srv/http -g http -s /bin/false http >/dev/null
+  fi
+  if [ ! "`grep ^scanner: etc/group`" ]; then
+    echo "adding new group: scanner"
+    usr/sbin/groupadd -g 96 scanner >/dev/null
+  fi
 }

Modified: group
===================================================================
--- group	2008-07-08 17:47:45 UTC (rev 4674)
+++ group	2008-07-08 19:16:06 UTC (rev 4675)
@@ -14,6 +14,7 @@
 uucp::14:
 log::19:root
 smmsp::25:
+http::33:
 games::50:
 network:x:90:
 video:x:91:
@@ -21,6 +22,7 @@
 optical::93:
 floppy:x:94:
 storage:x:95:
+scanner:x:96:
 power:x:98:
 nobody::99:
 users::100:

Modified: gshadow
===================================================================
--- gshadow	2008-07-08 17:47:45 UTC (rev 4674)
+++ gshadow	2008-07-08 19:16:06 UTC (rev 4675)
@@ -13,6 +13,7 @@
 mail:::
 log:::root
 smmsp:::
+http:::
 games:::
 network:x::
 video:x::
@@ -20,6 +21,7 @@
 optical:::
 floppy:x::
 storage:x::
+scanner:x::
 power:x::
 nobody:::
 users:::

Modified: passwd
===================================================================
--- passwd	2008-07-08 17:47:45 UTC (rev 4674)
+++ passwd	2008-07-08 19:16:06 UTC (rev 4675)
@@ -2,5 +2,6 @@
 bin:x:1:1:bin:/bin:/bin/false
 daemon:x:2:2:daemon:/sbin:/bin/false
 mail:x:8:12:mail:/var/spool/mail:/bin/false
-ftp:x:14:11:ftp:/home/ftp:/bin/false
+ftp:x:14:11:ftp:/srv/ftp:/bin/false
+http:x:33:33:http:/srv/http:/bin/false
 nobody:x:99:99:nobody:/:/bin/false

Modified: shadow
===================================================================
--- shadow	2008-07-08 17:47:45 UTC (rev 4674)
+++ shadow	2008-07-08 19:16:06 UTC (rev 4675)
@@ -3,4 +3,5 @@
 daemon:x:0::::::
 mail:x:0::::::
 ftp:x:0::::::
+http:x:0::::::
 nobody:x:0::::::