Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=288e449a93a8e1c471171983b80a155ced560867

commit 288e449a93a8e1c471171983b80a155ced560867
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sun Dec 5 12:38:30 2010 +0100

sysvinit-2.88-1-i686

* Bump to last version.
* Split sysvinit-tools from it, seems some tools are required by
systemd.

diff --git a/source/base/sysvinit/FrugalBuild b/source/base/sysvinit/FrugalBuild
index 30f38fa..3a2c02f 100644
--- a/source/base/sysvinit/FrugalBuild
+++ b/source/base/sysvinit/FrugalBuild
@@ -2,22 +2,30 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>

pkgname=sysvinit
-pkgver=2.86
-pkgrel=31
+pkgver=2.88
+pkgextraver=dsf
+pkgrel=1
pkgdesc="Init, the parent of all processes"
url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/";
-depends=('shadow>=4.1.2.1-2' 'util-linux-ng>=2.14-2' 'coreutils>=6.12-2' 
'glibc>=2.8-3' 'gawk>=3.1.6-3')
+depends=('shadow>=4.1.2.1-2' 'util-linux-ng>=2.14-2' 'coreutils>=6.12-2' 
'gawk>=3.1.6-3')
+subrodepends=("$pkgname-tools=$pkgver-$pkgrel")
groups=('base')
archs=('i686' 'x86_64' 'ppc')
backup=(etc/{inittab,rc.d/rc.local})
install=$pkgname.install
-up2date="wget --passive-ftp -O - -q 
ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/|grep tar.gz|tail -n 1|sed 
's/.*sysvinit-\(.*\)\.tar\.gz.*/\1/'"
-source=(ftp://ftp.cistron.nl/pub/people/miquels/$pkgname/$pkgname-$pkgver.tar.gz
 \
+up2date="Flasttar http://download.savannah.gnu.org/releases/$pkgname";
+source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver$pkgextraver.tar.bz2
 \
functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 rc.{de,en,hu,it}\
rc.functions rc.K rc.local rc.M rc.messages rc.reboot rc.reboot-{de,hu}.po \
-       rc.S rc.single rc.single-{de,hu}.po rc.sysvinit sysvinit-2.86.diff \
-       killall_exclude_pids.patch)
-sha1sums=('3e78df609a2ff0fea6304cb662a7f10298d03667' \
+       rc.S rc.single rc.single-{de,hu}.po rc.sysvinit sysvinit-2.86.diff)
+
+subpkgs=("$pkgname-tools")
+subdescs=('Init tools.')
+subdepends=('glibc>=2.8-3')
+subgroups=('xapps')
+subarchs=('i686 x86_64 ppc')
+
+sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' \
'05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \
'2da5b17f95c2331eda19daa6aede672a4d872b73' \
'83e5879898d7750b157552606a62f0f7bf1f0c97' \
@@ -43,8 +51,7 @@ sha1sums=('3e78df609a2ff0fea6304cb662a7f10298d03667' \
'64db4a11baebe28eaf5d71119c2cb5f091170957' \
'aa911a93c7ab733b1729f6a9c174b687aa2db58d' \
'b55eb418f8fef43077cec29c103b70fcb4d21329' \
-          '837541969bec9e391bd77a2c1a0cca5f7fb20e9b' \
-          'fec64c9a22e843d95d21a494b6d619892ec8621c')
+          '837541969bec9e391bd77a2c1a0cca5f7fb20e9b')

build()
{
@@ -54,7 +61,7 @@ build()

Fsed '-O2' "$CFLAGS" Makefile
Fmake
-       Fmakeinstall MANDIR=/usr/man ROOT=$Fdestdir
+       Fmakeinstall MANDIR=$Fmandir ROOT=$Fdestdir

Ffile /lib/initscripts/functions

@@ -77,6 +84,12 @@ build()

Fln rc.6 /etc/rc.d/rc.0
Fln rc.reboot /etc/rc.d/rc.halt
+
+       Fsplit $pkgname-tools /bin/{mountpoint,pidof}
+       Fsplit $pkgname-tools /usr/bin/{last,lastb,mesg,utmpdump,wall}
+       Fsplit $pkgname-tools /sbin/{killall5,sulogin}
+       Fsplit $pkgname-tools 
/usr/share/man/man1/{last,lastb,mesg,mountpoint,utmpdump,wall}.1*
+       Fsplit $pkgname-tools /usr/share/man/man8/{killall5,pidof,sulogin}.8*
}

# optimization OK
diff --git a/source/base/sysvinit/killall_exclude_pids.patch 
b/source/base/sysvinit/killall_exclude_pids.patch
deleted file mode 100644
index bb1a3a2..0000000
--- a/source/base/sysvinit/killall_exclude_pids.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-by Colin Watson <cjwat...@ubuntu.com>, Petter Reinholdtsen <p...@hungry.com>
-and Miklos Vajna <vmik...@frugalware.org>
-
-Implement '-o omitpid' option, to allow sendsigs to avoid killing
-processes that are e.g. implementing the root filesystem.
-diff -Naur sysvinit-2.86.orig/src/killall5.c sysvinit-2.86/src/killall5.c
---- sysvinit-2.86.orig/src/killall5.c  2004-07-30 14:16:23.000000000 +0200
-+++ sysvinit-2.86/src/killall5.c       2008-02-26 23:47:44.000000000 +0100
-@@ -555,11 +555,15 @@
-
-
-
-+#define KILLALL_OMITSZ        16
-+
- /* Main for either killall or pidof. */
- int main(int argc, char **argv)
- {
-       PROC            *p;
-       int             pid, sid = -1;
-+      pid_t           opid[KILLALL_OMITSZ];
-+      int             i, oind, omit = 0;
-       int             sig = SIGKILL;
-
-       /* Get program name. */
-@@ -576,10 +580,34 @@
-               return main_pidof(argc, argv);
-
-       /* Right, so we are "killall". */
-+      for (oind = KILLALL_OMITSZ-1; oind > 0; oind--)
-+              opid[oind] = 0;
-+
-       if (argc > 1) {
--              if (argc != 2) usage();
--              if (argv[1][0] == '-') (argv[1])++;
--              if ((sig = atoi(argv[1])) <= 0 || sig > 31) usage();
-+              for (i = 1; i < argc; i++) {
-+                      if (argv[i][0] == '-') (argv[i])++;
-+                      if (argv[i][0] == 'o') {
-+                              if (++i >= argc) usage();
-+                              if (oind >= KILLALL_OMITSZ -1) {
-+                                      nsyslog(LOG_ERR,"omit pid buffer size "
-+                                              "%d exceeded!\n",
-+                                              KILLALL_OMITSZ);
-+                                      closelog();
-+                                      exit(1);
-+                              }
-+                              if ((opid[oind] = atoi(argv[i])) < 1) {
-+                                      nsyslog(LOG_ERR,
-+                                              "illegal omit pid value "
-+                                              "(%s)!\n", argv[i]);
-+                                      closelog();
-+                                      exit(1);
-+                              }
-+                              oind++;
-+                              omit = 1;
-+                      }
-+                      else if ((sig = atoi(argv[1])) <= 0 || sig > 31)
-+                              usage();
-+              }
-       }
-
-       /* First get the /proc filesystem online. */
-@@ -608,9 +636,19 @@
-       /* Now kill all processes except our session. */
-       sid = (int)getsid(0);
-       pid = (int)getpid();
--      for (p = plist; p; p = p->next)
--              if (p->pid != pid && p->sid != sid && !p->kernel)
--                      kill(p->pid, sig);
-+      for (p = plist; p; p = p->next) {
-+              if (p->pid == 1 || p->pid == pid || p->sid == sid || p->kernel)
-+                      continue;
-+              if (omit) {
-+                      for (i = 0; i < oind; i++)
-+                              if (opid[i] == p->pid)
-+                                      break;
-+                      /* On a match, continue with the for loop above. */
-+                      if (i < oind)
-+                              continue;
-+              }
-+              kill(p->pid, sig);
-+      }
-
-       /* And let them continue. */
-       kill(-1, SIGCONT);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to