Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=3e527cb67d14d5a804935841ba470f3489750146
commit 3e527cb67d14d5a804935841ba470f3489750146 Author: crazy <[EMAIL PROTECTED]> Date: Mon Mar 10 15:21:17 2008 +0100 chkconfig-1.3.30c-1-i686 * Version bump * fixed url , source * added up2date again and removed that comment * which is not true anymore * added an frugalware patch to make it ignore * .pacxxx backup files and removed verbose ( debug ?! ) * output on --add diff --git a/source/base/chkconfig/FrugalBuild b/source/base/chkconfig/FrugalBuild index 9a25a77..c4b8d9d 100644 --- a/source/base/chkconfig/FrugalBuild +++ b/source/base/chkconfig/FrugalBuild @@ -2,22 +2,23 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=chkconfig -pkgver=1.2.24h -pkgrel=6 +pkgver=1.3.30c +pkgrel=1 pkgdesc="Updates and queries runlevel information for system services" -url="http://www.fastcoder.net/~thumper/software/sysadmin/chkconfig/"; -depends=('glibc' 'popt') +url="http://www.fastcoder.net/software/chkconfig/"; +depends=('glibc>=2.7-3' 'popt>=1.13') groups=('base' 'core') archs=('i686' 'x86_64' 'ppc') -# silence up2date, newer versions may be problematic and we'll switch to -# upstart soon -up2date="$pkgver" -source=(http://www.fastcoder.net/~thumper/downloads/chkconfig/$pkgname-$pkgver.tar.gz) -sha1sums=('c22cab9f75e7acdc50f9a2061e224705c43437db') +up2date="lynx -dump http://www.fastcoder.net/downloads/|Flasttar" +source=( http://www.fastcoder.net/downloads/$pkgname-$pkgver.tar.gz frugalware.patch) +sha1sums=('5041858adc384863c66e4a4110c951c19e4a690c' \ + '218905354a6828c8d0e3a439be02d21fbb190552') build() { - Fbuild --with-init-dir=/etc/rc.d + Fbuild \ + --with-init-dir=/etc/rc.d + --enable-threads=posix Fmkdir /etc/rc.d/rc{S,0,1,2,3,4,5,6}.d } diff --git a/source/base/chkconfig/frugalware.patch b/source/base/chkconfig/frugalware.patch new file mode 100644 index 0000000..9dac5ee --- /dev/null +++ b/source/base/chkconfig/frugalware.patch @@ -0,0 +1,82 @@ +diff -Naur chkconfig-1.3.30c/chkconfig.c chkconfig-1.3.30c-p/chkconfig.c +--- chkconfig-1.3.30c/chkconfig.c 2007-04-01 23:36:25.000000000 +0200 ++++ chkconfig-1.3.30c-p/chkconfig.c 2008-03-10 15:14:15.000000000 +0100 +@@ -202,13 +202,14 @@ + + /* Skip files with known bad extensions */ + if ((dn = strrchr(ent->d_name, '.')) != NULL && +- (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) ++ (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") ++ || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacsave") || !strcmp(dn, ".pacorig"))) + continue; +- ++ + dn = ent->d_name + strlen(ent->d_name) - 1; + if (*dn == '~' || *dn == ',') + continue; +- ++ + sprintf(fn, "%s/%s", conf.initdir, ent->d_name); + if (stat(fn, &sb)) { + continue; +@@ -224,7 +225,6 @@ + do { + nResolved = 0; + int i; +- + for (i = 0; i < numservs ; i++) { + if ((servs+i)->isLSB) + nResolved += frobOneDependencies(servs+i, servs, numservs, 0); +@@ -244,9 +244,13 @@ + return 1; + } + +- printf("start = %d\n", s.sPriority); +- printf("end = %d\n", s.kPriority); +- ++ #if 0 ++ ++ printf("start = %d\n", s.sPriority); ++ printf("end = %d\n", s.kPriority); ++ ++ #endif ++ + if (s.type == TYPE_XINETD) return 0; + if (s.isLSB) + frobDependencies(&s); +@@ -343,7 +347,7 @@ + + numServicesAlloced = 10; + services = malloc(sizeof(*services) * numServicesAlloced); +- ++ + if (!(dir = opendir(conf.initdir))) { + fprintf(stderr, _("failed to open %s: %s\n"), conf.initdir, + strerror(errno)); +@@ -361,13 +365,14 @@ + (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") + || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") + || !strcmp(dn, ".dpkg-dist") || !strcmp(dn, ".dpkg-old") +- || !strcmp(dn, ".dpkg-new"))) ++ || !strcmp(dn, ".dpkg-new") || !strcmp(dn, ".pacsave") ++ || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacorig"))) + continue; + + dn = ent->d_name + strlen(ent->d_name) - 1; + if (*dn == '~' || *dn == ',') + continue; +- ++ + sprintf(fn, "%s/%s", conf.initdir, ent->d_name); + if (stat(fn, &sb)) { + fprintf(stderr, _("error reading info for service %s: %s\n"), +@@ -421,7 +426,8 @@ + + /* Skip files with known bad extensions */ + if ((dn = strrchr(ent->d_name, '.')) != NULL && +- (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) ++ (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp") ++ ||!strcmp(dn, ".pacsave") || !strcmp(dn, ".pacnew") || !strcmp(dn, ".pacorig"))) + continue; + + dn = ent->d_name + strlen(ent->d_name) - 1; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
