commit 4482ab887ff09ae2c541caadb23cf197312ac738 Author: Juergen Daubert <jue@jue.li> Date: Tue Sep 14 20:58:06 2010 +0200 [notify] sysvinit: update to 2.88 To avoid an unclean unmount of "/" on next shutdown, reload the init process as root after the sysvinit-update: /sbin/telinit U diff --git a/sysvinit/.footprint b/sysvinit/.footprint index e371ce0..ad02aa9 100644 --- a/sysvinit/.footprint +++ b/sysvinit/.footprint @@ -1,6 +1,9 @@ drwxr-xr-x root/root bin/ -lrwxrwxrwx root/root bin/pidof -> ../sbin/killall5 +-rwxr-xr-x root/root bin/mountpoint +lrwxrwxrwx root/root bin/pidof -> /sbin/killall5 drwxr-xr-x root/root sbin/ +-rwxr-xr-x root/root sbin/bootlogd +-rwxr-xr-x root/root sbin/fstab-decode -rwxr-xr-x root/root sbin/halt -rwxr-xr-x root/root sbin/init -rwxr-xr-x root/root sbin/killall5 @@ -15,6 +18,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/last lrwxrwxrwx root/root usr/bin/lastb -> last -rwxr-xr-x root/root usr/bin/mesg +-rwxr-xr-x root/root usr/bin/utmpdump -rwxr-xr-x root/root usr/bin/wall drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/initreq.h @@ -23,11 +27,15 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/last.1.gz -rw-r--r-- root/root usr/man/man1/lastb.1.gz -rw-r--r-- root/root usr/man/man1/mesg.1.gz +-rw-r--r-- root/root usr/man/man1/mountpoint.1.gz +-rw-r--r-- root/root usr/man/man1/utmpdump.1.gz -rw-r--r-- root/root usr/man/man1/wall.1.gz drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/initscript.5.gz -rw-r--r-- root/root usr/man/man5/inittab.5.gz drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/bootlogd.8.gz +-rw-r--r-- root/root usr/man/man8/fstab-decode.8.gz -rw-r--r-- root/root usr/man/man8/halt.8.gz -rw-r--r-- root/root usr/man/man8/init.8.gz -rw-r--r-- root/root usr/man/man8/killall5.8.gz diff --git a/sysvinit/.md5sum b/sysvinit/.md5sum index 9f948cf..7af97a4 100644 --- a/sysvinit/.md5sum +++ b/sysvinit/.md5sum @@ -1,2 +1 @@ -db5fc89c347b6c9a5a9e94e0eeadf49e sysvinit-2.86.patch -7d5d61c026122ab791ac04c8a84db967 sysvinit-2.86.tar.gz +6eda8a97b86e0a6f59dabbf25202aa6f sysvinit-2.88dsf.tar.bz2 diff --git a/sysvinit/Pkgfile b/sysvinit/Pkgfile index 12529c6..6c564db 100644 --- a/sysvinit/Pkgfile +++ b/sysvinit/Pkgfile @@ -1,19 +1,17 @@ # Description: The Linux System V Init -# URL: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/ +# URL: https://savannah.nongnu.org/projects/sysvinit/ # Maintainer: CRUX System Team, core-ports at crux dot nu name=sysvinit -version=2.86 -release=6 -source=(ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/$name-$version.tar.gz \ - $name-$version.patch) +version=2.88 +release=1 +source=(http://download.savannah.gnu.org/releases/$name/$name-${version}dsf.tar.bz2) build() { - cd $name-$version - patch -p1 < ../$name-$version.patch - make -C src - make -C src ROOT=$PKG install - mkdir -p $PKG/var/log + cd $name-${version}dsf + make + make ROOT=$PKG MANDIR=/usr/man install + install -d $PKG/var/log touch $PKG/var/log/wtmp touch $PKG/var/log/btmp chmod 0600 $PKG/var/log/btmp diff --git a/sysvinit/sysvinit-2.86.patch b/sysvinit/sysvinit-2.86.patch deleted file mode 100644 index 1872e99..0000000 --- a/sysvinit/sysvinit-2.86.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ru sysvinit-2.86/src/Makefile sysvinit-2.86-new/src/Makefile ---- sysvinit-2.86/src/Makefile 2004-06-09 14:47:45.000000000 +0200 -+++ sysvinit-2.86-new/src/Makefile 2004-12-11 23:19:19.704905960 +0100 -@@ -9,7 +9,7 @@ - # - - CC = gcc --CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE -+CFLAGS += -Wall -fomit-frame-pointer -D_GNU_SOURCE - LDFLAGS = -s - STATIC = - -@@ -24,11 +24,10 @@ - MAN8 += shutdown.8 telinit.8 - - ifeq ($(DISTRO),) --BIN += mountpoint --SBIN += sulogin bootlogd --USRBIN += utmpdump wall --MAN1 += mountpoint.1 wall.1 --MAN8 += sulogin.8 bootlogd.8 -+SBIN += sulogin -+USRBIN += wall -+MAN1 += wall.1 -+MAN8 += sulogin.8 - endif - - ifeq ($(DISTRO),Debian) -@@ -47,7 +46,7 @@ - BIN_GROUP = root - BIN_COMBO = $(BIN_OWNER):$(BIN_GROUP) - INSTALL = install -o $(BIN_OWNER) -g $(BIN_GROUP) --MANDIR = /usr/share/man -+MANDIR = /usr/man - - # Additional libs for GNU libc. - ifneq ($(wildcard /usr/lib/libcrypt.a),) -@@ -111,31 +110,32 @@ - - install: - for i in $(BIN); do \ -- $(INSTALL) -m 755 $$i $(ROOT)/bin/; \ -+ $(INSTALL) -D -m 755 $$i $(ROOT)/bin/$$i; \ - done - for i in $(SBIN); do \ -- $(INSTALL) -m 755 $$i $(ROOT)/sbin/; \ -+ $(INSTALL) -D -m 755 $$i $(ROOT)/sbin/$$i; \ - done - for i in $(USRBIN); do \ -- $(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \ -+ $(INSTALL) -D -m 755 $$i $(ROOT)/usr/bin/$$i; \ - done - # $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/ - ln -sf halt $(ROOT)/sbin/reboot - ln -sf halt $(ROOT)/sbin/poweroff - ln -sf init $(ROOT)/sbin/telinit -+ install -d $(ROOT)/bin - ln -sf ../sbin/killall5 $(ROOT)/bin/pidof - if [ ! -f $(ROOT)/usr/bin/lastb ]; then \ - ln -sf last $(ROOT)/usr/bin/lastb; \ - fi -- $(INSTALL) -m 644 initreq.h $(ROOT)/usr/include/ -+ $(INSTALL) -D -m 644 initreq.h $(ROOT)/usr/include/initreq.h - for i in $(MAN1); do \ -- $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \ -+ $(INSTALL) -D -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/$$i; \ - done - for i in $(MAN5); do \ -- $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man5/; \ -+ $(INSTALL) -D -m 644 ../man/$$i $(ROOT)$(MANDIR)/man5/$$i; \ - done - for i in $(MAN8); do \ -- $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \ -+ $(INSTALL) -D -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/$$i; \ - done - ifeq ($(ROOT),) - # -diff -aur sysvinit-2.86.orig/src/init.c sysvinit-2.86/src/init.c ---- sysvinit-2.86.orig/src/init.c 2004-07-30 14:16:20.000000000 +0200 -+++ sysvinit-2.86/src/init.c 2010-07-23 16:32:36.679827761 +0200 -@@ -1884,7 +1884,7 @@ - * The existing init process execs a new init binary. - */ - env = init_buildenv(0); -- execl(myname, myname, "--init", NULL, env); -+ execle(myname, myname, "--init", NULL, env); - - /* - * We shouldn't be here, something failed.