August 2007 - crux-commits

ports/core (2.4): db: update to 4.5.20
by crux＠crux.nu 31 Aug '07

31 Aug '07

commit 122af66c05aedebb90ea8f6e06bedec75d4f384e Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 31 11:05:23 2007 +0200 db: update to 4.5.20 diff --git a/db/.footprint b/db/.footprint index 346a764..876628a 100644 --- a/db/.footprint +++ b/db/.footprint @@ -16,15 +16,15 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/db_185.h -rw-r--r-- root/root usr/include/db_cxx.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libdb-4.4.a --rw-r--r-- root/root usr/lib/libdb-4.4.la --rwxr-xr-x root/root usr/lib/libdb-4.4.so -lrwxrwxrwx root/root usr/lib/libdb-4.so -> libdb-4.4.so +-rw-r--r-- root/root usr/lib/libdb-4.5.a +-rw-r--r-- root/root usr/lib/libdb-4.5.la +-rwxr-xr-x root/root usr/lib/libdb-4.5.so +lrwxrwxrwx root/root usr/lib/libdb-4.so -> libdb-4.5.so -rw-r--r-- root/root usr/lib/libdb.a -lrwxrwxrwx root/root usr/lib/libdb.so -> libdb-4.4.so --rw-r--r-- root/root usr/lib/libdb_cxx-4.4.a --rw-r--r-- root/root usr/lib/libdb_cxx-4.4.la --rwxr-xr-x root/root usr/lib/libdb_cxx-4.4.so -lrwxrwxrwx root/root usr/lib/libdb_cxx-4.so -> libdb_cxx-4.4.so +lrwxrwxrwx root/root usr/lib/libdb.so -> libdb-4.5.so +-rw-r--r-- root/root usr/lib/libdb_cxx-4.5.a +-rw-r--r-- root/root usr/lib/libdb_cxx-4.5.la +-rwxr-xr-x root/root usr/lib/libdb_cxx-4.5.so +lrwxrwxrwx root/root usr/lib/libdb_cxx-4.so -> libdb_cxx-4.5.so -rw-r--r-- root/root usr/lib/libdb_cxx.a -lrwxrwxrwx root/root usr/lib/libdb_cxx.so -> libdb_cxx-4.4.so +lrwxrwxrwx root/root usr/lib/libdb_cxx.so -> libdb_cxx-4.5.so diff --git a/db/.md5sum b/db/.md5sum index fd3934b..272ec78 100644 --- a/db/.md5sum +++ b/db/.md5sum @@ -1,5 +1,3 @@ -d84dff288a19186b136b0daf7067ade3 db-4.4.20.tar.gz -66584d621355df055b6e05b4a02e9c3e patch.4.4.20.1 -85df93a0867f6cace3501671cdeb6ed1 patch.4.4.20.2 -88ee91889ebf5498b22b2e7bed945d41 patch.4.4.20.3 -c2ef7b3e59460c35950fab5f2faa3fc0 patch.4.4.20.4 +b0f1c777708cb8e9d37fb47e7ed3312d db-4.5.20.tar.gz +a571e239b9041d7990df287cbc59ad6f patch.4.5.20.1 +b7a7086a067ba116f5a8464362c9a9a7 patch.4.5.20.2 diff --git a/db/Pkgfile b/db/Pkgfile index 0401e25..cfb0218 100644 --- a/db/Pkgfile +++ b/db/Pkgfile @@ -3,14 +3,14 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=db -version=4.4.20 -release=2 +version=4.5.20 +release=1 source=(http://download.oracle.com/berkeley-db/$name-$version.tar.gz \ - http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patc…) + http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patc…) build() { cd $name-$version - cat $SRC/patch.4.4.20.{1,2,3,4} | patch -p0 + cat $SRC/patch.4.5.20.{1,2} | patch -p0 cd build_unix LDFLAGS="-lpthread" \ ../dist/configure --prefix=/usr \

1 0

ports/core (2.4): Merge branch '2.3' into 2.4
by crux＠crux.nu 31 Aug '07

31 Aug '07

commit 771a5ec5421d17e8fee74388409caf0ff0e74b57 Merge: ae3ae2a... 464f176... Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 31 10:56:51 2007 +0200 Merge branch '2.3' into 2.4

1 0

ports/core (2.4): exim: update to 4.68
by crux＠crux.nu 31 Aug '07

31 Aug '07

commit 464f1763550593d394ac33d6552bb3e8a818bba1 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 31 10:55:02 2007 +0200 exim: update to 4.68 diff --git a/exim/.footprint b/exim/.footprint index d635253..55b3d67 100644 --- a/exim/.footprint +++ b/exim/.footprint @@ -6,15 +6,15 @@ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/exim drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.67-1 +lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.68-1 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/exim.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/exicyclog -rwxr-xr-x root/root usr/sbin/exigrep -lrwxrwxrwx root/root usr/sbin/exim -> exim-4.67-1 --rwsr-xr-x root/root usr/sbin/exim-4.67-1 +lrwxrwxrwx root/root usr/sbin/exim -> exim-4.68-1 +-rwsr-xr-x root/root usr/sbin/exim-4.68-1 -rwxr-xr-x root/root usr/sbin/exim_checkaccess -rwxr-xr-x root/root usr/sbin/exim_dbmbuild -rwxr-xr-x root/root usr/sbin/exim_dumpdb @@ -27,7 +27,7 @@ lrwxrwxrwx root/root usr/sbin/exim -> exim-4.67-1 -rwxr-xr-x root/root usr/sbin/exiqgrep -rwxr-xr-x root/root usr/sbin/exiqsumm -rwxr-xr-x root/root usr/sbin/exiwhat -lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.67-1 +lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.68-1 drwxr-xr-x root/root var/ drwxr-xr-x root/root var/log/ drwxr-x--- mail/mail var/log/exim/ diff --git a/exim/.md5sum b/exim/.md5sum index 28b387e..dea0094 100644 --- a/exim/.md5sum +++ b/exim/.md5sum @@ -1,3 +1,3 @@ f1682811a7fd2897153c5b0e33177509 exim -9ee83186d9ac99e5ff297112aa6fddf0 exim-4.67.tar.bz2 +94c46a8bc24b3ad4ad892228449f378b exim-4.68.tar.bz2 f9edb79bd90e2b6e8233b2ef26e95aa9 exim-config.patch diff --git a/exim/Pkgfile b/exim/Pkgfile index 05b3db0..4718868 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db, openssl name=exim -version=4.67 +version=4.68 release=1 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \ $name $name-config.patch)

1 0

ports/core (2.4): sysklogd: update to 1.5
by crux＠crux.nu 31 Aug '07

31 Aug '07

commit 8ce33423ae62fadf2eb738f38005602172278e1b Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 31 10:54:20 2007 +0200 sysklogd: update to 1.5 diff --git a/sysklogd/.md5sum b/sysklogd/.md5sum index 5f41339..1bb10f0 100644 --- a/sysklogd/.md5sum +++ b/sysklogd/.md5sum @@ -1,5 +1,4 @@ b379693c8b89c99994e58efd49f98a71 rotatelog -ee4ba45c59bb1098c0b05b5546a46c2f sysklogd-1.4.1.patch -d214aa40beabf7bdb0c9b3c64432c774 sysklogd-1.4.1.tar.gz +e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz bf5c13b44ab9fa15cda9bfa9df9b584e syslog 022ca2758664748ae096d57eac9ac555 syslog.conf diff --git a/sysklogd/Pkgfile b/sysklogd/Pkgfile index 4c3e9a1..d48469a 100644 --- a/sysklogd/Pkgfile +++ b/sysklogd/Pkgfile @@ -3,14 +3,13 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=sysklogd -version=1.4.1 -release=5 +version=1.5 +release=1 source=(http://www.ibiblio.org/pub/Linux/system/daemons/$name-$version.tar.… \ - rotatelog syslog syslog.conf $name-$version.patch) + rotatelog syslog syslog.conf) build() { cd $name-$version - patch -p1 < ../$name-$version.patch mkdir -p $PKG/usr/sbin \ $PKG/etc/cron/weekly \ $PKG/var/log \ diff --git a/sysklogd/sysklogd-1.4.1.patch b/sysklogd/sysklogd-1.4.1.patch deleted file mode 100644 index 85cf6e0..0000000 --- a/sysklogd/sysklogd-1.4.1.patch +++ /dev/null @@ -1,586 +0,0 @@ -diff -Nru sysklogd-1.4.1/Makefile sysklogd-1.4.1-new/Makefile ---- sysklogd-1.4.1/Makefile 1998-10-12 22:25:15.000000000 +0200 -+++ sysklogd-1.4.1-new/Makefile 2004-09-21 23:00:34.656626400 +0200 -@@ -3,13 +3,13 @@ - CC= gcc - #CFLAGS= -g -DSYSV -Wall - #LDFLAGS= -g --CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce --LDFLAGS= -s -+CFLAGS= $(RPM_OPT_FLAGS) -DSYSV -D_GNU_SOURCE -Wall -+LDFLAGS= - - # Look where your install program is. - INSTALL = /usr/bin/install --BINDIR = /usr/sbin --MANDIR = /usr/man -+BINDIR = $(TOPDIR)/sbin -+MANDIR = $(TOPDIR)/usr/man - - # There is one report that under an all ELF system there may be a need to - # explicilty link with libresolv.a. If linking syslogd fails you may wish -@@ -106,17 +106,51 @@ - ${CC} ${CFLAGS} -DTEST -o ksym_test.o -c ksym.c - - clean: -- rm -f *.o *.log *~ *.orig -+ rm -f *.o *.log *~ *.orig sysklogd-*.tar.gz syslogd klogd - - clobber: clean - rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd - - install_exec: syslogd klogd -- ${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd -- ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd -+ ${INSTALL} -m 500 syslogd ${BINDIR}/syslogd -+ ${INSTALL} -m 500 klogd ${BINDIR}/klogd - - install_man: -- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 sysklogd.8 ${MANDIR}/man8/sysklogd.8 -- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 syslogd.8 ${MANDIR}/man8/syslogd.8 -- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 -- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 klogd.8 ${MANDIR}/man8/klogd.8 -+ ${INSTALL} -m 644 sysklogd.8 ${MANDIR}/man8/sysklogd.8 -+ ${INSTALL} -m 644 syslogd.8 ${MANDIR}/man8/syslogd.8 -+ ${INSTALL} -m 644 syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 -+ ${INSTALL} -m 644 klogd.8 ${MANDIR}/man8/klogd.8 -+ -+ -+## Red Hat specific additions -+ -+VER1 = $(shell awk '/VERSION/ { print $$3 }' version.h | sed 's|"||g') -+VER2 = $(shell awk '/PATCHLEVEL/ { print $$3 }' version.h | sed 's|"||g') -+VERSION = $(VER1).$(VER2) -+RELEASE = $(shell awk '/Release:/ { print $$2 }' sysklogd.spec.in) -+CVSTAG = sysklogd-$(subst .,_,$(VERSION))-$(subst .,-,$(RELEASE)) -+ -+changelog: -+ rcs2log | sed "s|@.*redhat\.com|@redhat.com|" | sed "s|@@|@|" | \ -+ sed "s|/mnt/devel/CVS/sysklogd/||g" > redhat/changenew -+ mv redhat/ChangeLog redhat/ChangeLog.old -+ cat redhat/changenew redhat/ChangeLog.old > redhat/ChangeLog -+ rm -f redhat/changenew -+ -+tag-archive: -+ @cvs -Q tag -F $(CVSTAG) -+ -+create-archive: -+ @rm -rf /tmp/sysklogd -+ @cd /tmp ; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) sysklogd || echo "Um... export aborted." -+ @sed 's/VERSIONSUBST/$(VERSION)/' < /tmp/sysklogd/sysklogd.spec.in > /tmp/sysklogd/sysklogd.spec -+ @rm /tmp/sysklogd/sysklogd.spec.in -+ @mv /tmp/sysklogd /tmp/sysklogd-$(VERSION)rh -+ @cd /tmp ; tar -czSpf sysklogd-$(VERSION)rh.tar.gz sysklogd-$(VERSION)rh -+ @rm -rf /tmp/sysklogd-$(VERSION)rh -+ @cp /tmp/sysklogd-$(VERSION)rh.tar.gz . -+ @rm -f /tmp/sysklogd-$(VERSION)rh.tar.gz -+ @echo "" -+ @echo "The final archive is in sysklogd-$(VERSION)rh.tar.gz" -+ -+archive: clean tag-archive create-archive -diff -Nru sysklogd-1.4.1/klogd.c sysklogd-1.4.1-new/klogd.c ---- sysklogd-1.4.1/klogd.c 2001-03-11 20:40:10.000000000 +0100 -+++ sysklogd-1.4.1-new/klogd.c 2004-09-21 23:00:13.203887712 +0200 -@@ -275,6 +275,10 @@ - #define ksyslog klogctl - #endif - -+#ifndef _PATH_KLOG -+#define _PATH_KLOG "/proc/kmsg" -+#endif -+ - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 - -@@ -291,7 +295,7 @@ - terminate = 0, - caught_TSTP = 0, - reload_symbols = 0, -- console_log_level = -1; -+ console_log_level = 6; - - static int use_syscall = 0, - one_shot = 0, -@@ -509,8 +513,7 @@ - - - /* Set level of kernel console messaging.. */ -- if ( (console_log_level != -1) -- && (ksyslog(8, NULL, console_log_level) < 0) && \ -+ if ( (ksyslog(8, NULL, console_log_level) < 0) && \ - (errno == EINVAL) ) - { - /* -@@ -887,8 +890,7 @@ - value = strtoul(sym_start+1, (char **) 0, 16); - *(line-1) = '>'; /* put back delim */ - -- symbol = LookupSymbol(value, &sym); -- if ( !symbol_lookup || symbol == (char *) 0 ) -+ if ( !symbol_lookup || (symbol = LookupSymbol(value, &sym)) == (char *)0 ) - { - parse_state = PARSING_TEXT; - break; -@@ -938,7 +940,7 @@ - * messages into this fresh buffer. - */ - memset(log_buffer, '\0', sizeof(log_buffer)); -- if ( (rdcnt = ksyslog(2, log_buffer, sizeof(log_buffer))) < 0 ) -+ if ( (rdcnt = ksyslog(2, log_buffer, sizeof(log_buffer)-1)) < 0 ) - { - if ( errno == EINTR ) - return; -@@ -1143,8 +1145,11 @@ - if ( one_shot ) - { - if (symbol_lookup) { -- InitKsyms(symfile); -- InitMsyms(); -+ symbol_lookup = (InitKsyms(symfile) == 1); -+ symbol_lookup |= InitMsyms(); -+ if (symbol_lookup == 0) { -+ Syslog(LOG_WARNING, "cannot find any symbols, turning off symbol lookups\n"); -+ } - } - if ( (logsrc = GetKernelLogSrc()) == kernel ) - LogKernelLine(); -@@ -1159,8 +1164,11 @@ - #endif - logsrc = GetKernelLogSrc(); - if (symbol_lookup) { -- InitKsyms(symfile); -- InitMsyms(); -+ symbol_lookup = (InitKsyms(symfile) == 1); -+ symbol_lookup |= InitMsyms(); -+ if (symbol_lookup == 0) { -+ Syslog(LOG_WARNING, "cannot find any symbols, turning off symbol lookups\n"); -+ } - } - - /* The main loop. */ -diff -Nru sysklogd-1.4.1/ksym.c sysklogd-1.4.1-new/ksym.c ---- sysklogd-1.4.1/ksym.c 2000-09-12 23:53:31.000000000 +0200 -+++ sysklogd-1.4.1-new/ksym.c 2004-09-21 23:00:13.204887560 +0200 -@@ -112,6 +112,7 @@ - #include <stdlib.h> - #include <malloc.h> - #include <sys/utsname.h> -+#include <ctype.h> - #include "klogd.h" - #include "ksyms.h" - -@@ -344,6 +345,7 @@ - if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) { - if (CheckMapVersion(symfile) == 1) - file = symfile; -+ fclose(sym_file); - } - if (sym_file == (FILE *) 0 || file == (char *) 0) { - sprintf (symfile, "%s", *mf); -@@ -352,6 +354,7 @@ - if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) { - if (CheckMapVersion(symfile) == 1) - file = symfile; -+ fclose(sym_file); - } - } - -diff -Nru sysklogd-1.4.1/ksym_mod.c sysklogd-1.4.1-new/ksym_mod.c ---- sysklogd-1.4.1/ksym_mod.c 2000-09-12 23:15:28.000000000 +0200 -+++ sysklogd-1.4.1-new/ksym_mod.c 2004-09-21 23:00:13.205887408 +0200 -@@ -93,7 +93,7 @@ - #include <linux/time.h> - #include <linux/module.h> - #else /* __GLIBC__ */ --#include <linux/module.h> -+#include "module.h" - extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - extern int get_kernel_syms __P ((struct kernel_sym *__table)); - #endif /* __GLIBC__ */ -diff -Nru sysklogd-1.4.1/module.h sysklogd-1.4.1-new/module.h ---- sysklogd-1.4.1/module.h 1970-01-01 01:00:00.000000000 +0100 -+++ sysklogd-1.4.1-new/module.h 2004-09-21 23:00:13.205887408 +0200 -@@ -0,0 +1,62 @@ -+ -+/* Module definitions for klogd's module support */ -+struct kernel_sym -+{ -+ unsigned long value; -+ char name[60]; -+}; -+ -+struct module_symbol -+{ -+ unsigned long value; -+ const char *name; -+}; -+ -+struct module_ref -+{ -+ struct module *dep; /* "parent" pointer */ -+ struct module *ref; /* "child" pointer */ -+ struct module_ref *next_ref; -+}; -+ -+struct module_info -+{ -+ unsigned long addr; -+ unsigned long size; -+ unsigned long flags; -+ long usecount; -+}; -+ -+ -+typedef struct { volatile int counter; } atomic_t; -+ -+struct module -+{ -+ unsigned long size_of_struct; /* == sizeof(module) */ -+ struct module *next; -+ const char *name; -+ unsigned long size; -+ -+ union -+ { -+ atomic_t usecount; -+ long pad; -+ } uc; /* Needs to keep its size - so says rth */ -+ -+ unsigned long flags; /* AUTOCLEAN et al */ -+ -+ unsigned nsyms; -+ unsigned ndeps; -+ -+ struct module_symbol *syms; -+ struct module_ref *deps; -+ struct module_ref *refs; -+ int (*init)(void); -+ void (*cleanup)(void); -+ const struct exception_table_entry *ex_table_start; -+ const struct exception_table_entry *ex_table_end; -+#ifdef __alpha__ -+ unsigned long gp; -+#endif -+}; -+ -diff -Nru sysklogd-1.4.1/sysklogd.8 sysklogd-1.4.1-new/sysklogd.8 ---- sysklogd-1.4.1/sysklogd.8 2001-03-11 20:35:51.000000000 +0100 -+++ sysklogd-1.4.1-new/sysklogd.8 2004-09-21 23:00:13.206887256 +0200 -@@ -30,6 +30,7 @@ - .I domainlist - ] - .RB [ " \-v " ] -+.RB [ " \-x " ] - .LP - .SH DESCRIPTION - .B Sysklogd -@@ -152,6 +153,11 @@ - .TP - .B "\-v" - Print version and exit. -+.TP -+.B "\-x" -+Disable name lookups when receiving remote messages. -+This avoids deadlocks when the nameserver is running on -+the same machine that runs the syslog daemon. - .LP - .SH SIGNALS - .B Syslogd -diff -Nru sysklogd-1.4.1/syslog_tst.c sysklogd-1.4.1-new/syslog_tst.c ---- sysklogd-1.4.1/syslog_tst.c 1997-06-02 19:21:41.000000000 +0200 -+++ sysklogd-1.4.1-new/syslog_tst.c 2004-09-21 23:00:13.206887256 +0200 -@@ -42,7 +42,7 @@ - if ( (nl = strrchr(bufr, '\n')) != \ - (char *) 0) - *nl = '\0'; -- syslog(LOG_INFO, bufr); -+ syslog(LOG_INFO, "%s", bufr); - logged += strlen(bufr); - if ( logged > 1024 ) - { -@@ -54,7 +54,7 @@ - } - else - while (argc-- > 1) -- syslog(LOG_INFO, argv++[1]); -+ syslog(LOG_INFO, "%s", argv++[1]); - } - else - { -diff -Nru sysklogd-1.4.1/syslogd.c sysklogd-1.4.1-new/syslogd.c ---- sysklogd-1.4.1/syslogd.c 2001-03-11 20:40:10.000000000 +0100 -+++ sysklogd-1.4.1-new/syslogd.c 2004-09-21 23:00:13.209886800 +0200 -@@ -637,8 +637,8 @@ - * in seconds after previous message is logged. After each flush, - * we move to the next interval until we reach the largest. - */ --int repeatinterval[] = { 30, 60 }; /* # of secs before flush */ --#define MAXREPEAT ((sizeof(repeatinterval) / sizeof(repeatinterval[0])) - 1) -+time_t repeatinterval[] = { 30, 60 }; /* # of secs before flush */ -+#define MAXREPEAT ((int) ((sizeof(repeatinterval) / sizeof(repeatinterval[0])) - 1)) - #define REPEATTIME(f) ((f)->f_time + repeatinterval[(f)->f_repeatcount]) - #define BACKOFF(f) { if (++(f)->f_repeatcount > MAXREPEAT) \ - (f)->f_repeatcount = MAXREPEAT; \ -@@ -730,6 +730,7 @@ - int MarkInterval = 20 * 60; /* interval between marks in seconds */ - int MarkSeq = 0; /* mark sequence number */ - int NoFork = 0; /* don't fork - don't run in daemon mode */ -+int DisableDNS = 0; /* don't look up IP addresses of incoming messages */ - int AcceptRemote = 0; /* receive messages that come via UDP */ - char **StripDomains = NULL; /* these domains may be stripped before writing logs */ - char **LocalHosts = NULL; /* these hosts are logged with their hostname */ -@@ -743,7 +744,7 @@ - char **crunch_list(char *list); - int usage(void); - void untty(void); --void printchopped(const char *hname, char *msg, int len, int fd); -+void printchopped(const char *hname, char *msg, size_t len, int fd); - void printline(const char *hname, char *msg); - void printsys(char *msg); - void logmsg(int pri, char *msg, const char *from, int flags); -@@ -786,7 +787,7 @@ - int len, num_fds; - #else /* __GLIBC__ */ - #ifndef TESTING -- size_t len; -+ socklen_t len; - #endif - int num_fds; - #endif /* __GLIBC__ */ -@@ -829,7 +830,7 @@ - funix[i] = -1; - } - -- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF) -+ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:vx")) != EOF) - switch((char)ch) { - case 'a': - if (nfunix < MAXFUNIX) -@@ -877,6 +878,9 @@ - case 'v': - printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); - exit (0); -+ case 'x': -+ DisableDNS = 1; -+ break; - case '?': - default: - usage(); -@@ -890,11 +894,11 @@ - dprintf("Checking pidfile.\n"); - if (!check_pid(PidFile)) - { -+ signal (SIGTERM, doexit); - if (fork()) { - /* - * Parent process - */ -- signal (SIGTERM, doexit); - sleep(300); - /* - * Not reached unless something major went wrong. 5 -@@ -906,6 +910,7 @@ - */ - exit(1); - } -+ signal (SIGTERM, SIG_DFL); - num_fds = getdtablesize(); - for (i= 0; i < num_fds; i++) - (void) close(i); -@@ -1074,9 +1079,9 @@ - (fd_set *) NULL, (struct timeval *) NULL); - if ( restart ) - { -+ restart = 0; - dprintf("\nReceived SIGHUP, reloading syslogd.\n"); - init(); -- restart = 0; - continue; - } - if (nfds == 0) { -@@ -1145,8 +1150,7 @@ - dprintf("INET socket error: %d = %s.\n", \ - errno, strerror(errno)); - logerror("recvfrom inet"); -- /* should be harmless now that we set -- * BSDCOMPAT on the socket */ -+ /* should be harmless */ - sleep(10); - } - } -@@ -1174,7 +1178,7 @@ - - int usage() - { -- fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ -+ fprintf(stderr, "usage: syslogd [-drvxh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ - " [-s domainlist] [-f conffile]\n"); - exit(1); - } -@@ -1232,15 +1236,6 @@ - close(fd); - return -1; - } -- /* We need to enable BSD compatibility. Otherwise an attacker -- * could flood our log files by sending us tons of ICMP errors. -- */ -- if (setsockopt(fd, SOL_SOCKET, SO_BSDCOMPAT, \ -- (char *) &on, sizeof(on)) < 0) { -- logerror("setsockopt(BSDCOMPAT), suspending inet"); -- close(fd); -- return -1; -- } - if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) { - logerror("bind, suspending inet"); - close(fd); -@@ -1254,30 +1249,26 @@ - crunch_list(list) - char *list; - { -- int count, i; -+ int i, m, n; - char *p, *q; - char **result = NULL; - - p = list; - - /* strip off trailing delimiters */ -- while (p[strlen(p)-1] == LIST_DELIMITER) { -- count--; -+ while (*p && p[strlen(p)-1] == LIST_DELIMITER) - p[strlen(p)-1] = '\0'; -- } - /* cut off leading delimiters */ -- while (p[0] == LIST_DELIMITER) { -- count--; -+ while (p[0] == LIST_DELIMITER) - p++; -- } - -- /* count delimiters to calculate elements */ -- for (count=i=0; p[i]; i++) -- if (p[i] == LIST_DELIMITER) count++; -+ /* count delimiters to calculate the number of elements */ -+ for (n = i = 0; p[i]; i++) -+ if (p[i] == LIST_DELIMITER) n++; - -- if ((result = (char **)malloc(sizeof(char *) * count+2)) == NULL) { -+ if ((result = (char **)malloc(sizeof(char *) * (n + 2))) == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } - - /* -@@ -1285,30 +1276,28 @@ - * characters are different from any delimiters, - * so we don't have to care about this. - */ -- count = 0; -- while ((q=strchr(p, LIST_DELIMITER))) { -- result[count] = (char *) malloc((q - p + 1) * sizeof(char)); -- if (result[count] == NULL) { -+ m = 0; -+ while ((q = strchr(p, LIST_DELIMITER)) && m < n) { -+ result[m] = (char *) malloc((q - p + 1) * sizeof(char)); -+ if (result[m] == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } -- strncpy(result[count], p, q - p); -- result[count][q - p] = '\0'; -+ memcpy(result[m], p, q - p); -+ result[m][q - p] = '\0'; - p = q; p++; -- count++; -+ m++; - } -- if ((result[count] = \ -- (char *)malloc(sizeof(char) * strlen(p) + 1)) == NULL) { -+ if ((result[m] = strdup(p)) == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } -- strcpy(result[count],p); -- result[++count] = NULL; -+ result[++m] = NULL; - - #if 0 -- count=0; -- while (result[count]) -- dprintf ("#%d: %s\n", count, StripDomains[count++]); -+ m = 0; -+ while (result[m]) -+ dprintf ("#%d: %s\n", m, result[m++]); - #endif - return result; - } -@@ -1346,7 +1335,7 @@ - void printchopped(hname, msg, len, fd) - const char *hname; - char *msg; -- int len; -+ size_t len; - int fd; - { - auto int ptlngth; -@@ -1446,6 +1435,7 @@ - while ((c = *p++) && q < &line[sizeof(line) - 4]) { - if (c == '\n') - *q++ = ' '; -+#if 0 - else if (c < 040) { - *q++ = '^'; - *q++ = c ^ 0100; -@@ -1454,7 +1444,9 @@ - *q++ = '0' + ((c & 0300) >> 6); - *q++ = '0' + ((c & 0070) >> 3); - *q++ = '0' + (c & 0007); -- } else -+ } -+#endif -+ else - *q++ = c; - } - *q = '\0'; -@@ -1839,7 +1831,7 @@ - #else - && e == EBADF) { - #endif -- f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND|O_NOCTTY); -+ f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND|O_NOCTTY|O_LARGEFILE); - if (f->f_file < 0) { - f->f_type = F_UNUSED; - logerror(f->f_un.f_fname); -@@ -1929,7 +1921,7 @@ - /* is this slot used? */ - if (ut.ut_name[0] == '\0') - continue; -- if (ut.ut_type == LOGIN_PROCESS) -+ if (ut.ut_type != USER_PROCESS) - continue; - if (!(strcmp (ut.ut_name,"LOGIN"))) /* paranoia */ - continue; -@@ -2013,7 +2005,10 @@ - dprintf("Malformed from address.\n"); - return ("???"); - } -- hp = gethostbyaddr((char *) &f->sin_addr, sizeof(struct in_addr), \ -+ if (DisableDNS) -+ hp = 0; -+ else -+ hp = gethostbyaddr((char *) &f->sin_addr, sizeof(struct in_addr), \ - f->sin_family); - if (hp == 0) { - dprintf("Host name for your address (%s) unknown.\n", -@@ -2640,7 +2635,7 @@ - f->f_file = open(++p, O_RDWR|O_NONBLOCK); - f->f_type = F_PIPE; - } else { -- f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY, -+ f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY|O_LARGEFILE, - 0644); - f->f_type = F_FILE; - }

1 0

ports/core (2.3): exim: update to 4.68
by crux＠crux.nu 31 Aug '07

31 Aug '07

commit 464f1763550593d394ac33d6552bb3e8a818bba1 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 31 10:55:02 2007 +0200 exim: update to 4.68 diff --git a/exim/.footprint b/exim/.footprint index d635253..55b3d67 100644 --- a/exim/.footprint +++ b/exim/.footprint @@ -6,15 +6,15 @@ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/exim drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.67-1 +lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.68-1 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/exim.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/exicyclog -rwxr-xr-x root/root usr/sbin/exigrep -lrwxrwxrwx root/root usr/sbin/exim -> exim-4.67-1 --rwsr-xr-x root/root usr/sbin/exim-4.67-1 +lrwxrwxrwx root/root usr/sbin/exim -> exim-4.68-1 +-rwsr-xr-x root/root usr/sbin/exim-4.68-1 -rwxr-xr-x root/root usr/sbin/exim_checkaccess -rwxr-xr-x root/root usr/sbin/exim_dbmbuild -rwxr-xr-x root/root usr/sbin/exim_dumpdb @@ -27,7 +27,7 @@ lrwxrwxrwx root/root usr/sbin/exim -> exim-4.67-1 -rwxr-xr-x root/root usr/sbin/exiqgrep -rwxr-xr-x root/root usr/sbin/exiqsumm -rwxr-xr-x root/root usr/sbin/exiwhat -lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.67-1 +lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.68-1 drwxr-xr-x root/root var/ drwxr-xr-x root/root var/log/ drwxr-x--- mail/mail var/log/exim/ diff --git a/exim/.md5sum b/exim/.md5sum index 28b387e..dea0094 100644 --- a/exim/.md5sum +++ b/exim/.md5sum @@ -1,3 +1,3 @@ f1682811a7fd2897153c5b0e33177509 exim -9ee83186d9ac99e5ff297112aa6fddf0 exim-4.67.tar.bz2 +94c46a8bc24b3ad4ad892228449f378b exim-4.68.tar.bz2 f9edb79bd90e2b6e8233b2ef26e95aa9 exim-config.patch diff --git a/exim/Pkgfile b/exim/Pkgfile index 05b3db0..4718868 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db, openssl name=exim -version=4.67 +version=4.68 release=1 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \ $name $name-config.patch)

1 0

ports/core (2.3): sysklogd: update to 1.5
by crux＠crux.nu 31 Aug '07

31 Aug '07

commit 8ce33423ae62fadf2eb738f38005602172278e1b Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 31 10:54:20 2007 +0200 sysklogd: update to 1.5 diff --git a/sysklogd/.md5sum b/sysklogd/.md5sum index 5f41339..1bb10f0 100644 --- a/sysklogd/.md5sum +++ b/sysklogd/.md5sum @@ -1,5 +1,4 @@ b379693c8b89c99994e58efd49f98a71 rotatelog -ee4ba45c59bb1098c0b05b5546a46c2f sysklogd-1.4.1.patch -d214aa40beabf7bdb0c9b3c64432c774 sysklogd-1.4.1.tar.gz +e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz bf5c13b44ab9fa15cda9bfa9df9b584e syslog 022ca2758664748ae096d57eac9ac555 syslog.conf diff --git a/sysklogd/Pkgfile b/sysklogd/Pkgfile index 4c3e9a1..d48469a 100644 --- a/sysklogd/Pkgfile +++ b/sysklogd/Pkgfile @@ -3,14 +3,13 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=sysklogd -version=1.4.1 -release=5 +version=1.5 +release=1 source=(http://www.ibiblio.org/pub/Linux/system/daemons/$name-$version.tar.… \ - rotatelog syslog syslog.conf $name-$version.patch) + rotatelog syslog syslog.conf) build() { cd $name-$version - patch -p1 < ../$name-$version.patch mkdir -p $PKG/usr/sbin \ $PKG/etc/cron/weekly \ $PKG/var/log \ diff --git a/sysklogd/sysklogd-1.4.1.patch b/sysklogd/sysklogd-1.4.1.patch deleted file mode 100644 index 85cf6e0..0000000 --- a/sysklogd/sysklogd-1.4.1.patch +++ /dev/null @@ -1,586 +0,0 @@ -diff -Nru sysklogd-1.4.1/Makefile sysklogd-1.4.1-new/Makefile ---- sysklogd-1.4.1/Makefile 1998-10-12 22:25:15.000000000 +0200 -+++ sysklogd-1.4.1-new/Makefile 2004-09-21 23:00:34.656626400 +0200 -@@ -3,13 +3,13 @@ - CC= gcc - #CFLAGS= -g -DSYSV -Wall - #LDFLAGS= -g --CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce --LDFLAGS= -s -+CFLAGS= $(RPM_OPT_FLAGS) -DSYSV -D_GNU_SOURCE -Wall -+LDFLAGS= - - # Look where your install program is. - INSTALL = /usr/bin/install --BINDIR = /usr/sbin --MANDIR = /usr/man -+BINDIR = $(TOPDIR)/sbin -+MANDIR = $(TOPDIR)/usr/man - - # There is one report that under an all ELF system there may be a need to - # explicilty link with libresolv.a. If linking syslogd fails you may wish -@@ -106,17 +106,51 @@ - ${CC} ${CFLAGS} -DTEST -o ksym_test.o -c ksym.c - - clean: -- rm -f *.o *.log *~ *.orig -+ rm -f *.o *.log *~ *.orig sysklogd-*.tar.gz syslogd klogd - - clobber: clean - rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd - - install_exec: syslogd klogd -- ${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd -- ${INSTALL} -m 500 -s klogd ${BINDIR}/klogd -+ ${INSTALL} -m 500 syslogd ${BINDIR}/syslogd -+ ${INSTALL} -m 500 klogd ${BINDIR}/klogd - - install_man: -- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 sysklogd.8 ${MANDIR}/man8/sysklogd.8 -- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 syslogd.8 ${MANDIR}/man8/syslogd.8 -- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 -- ${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 klogd.8 ${MANDIR}/man8/klogd.8 -+ ${INSTALL} -m 644 sysklogd.8 ${MANDIR}/man8/sysklogd.8 -+ ${INSTALL} -m 644 syslogd.8 ${MANDIR}/man8/syslogd.8 -+ ${INSTALL} -m 644 syslog.conf.5 ${MANDIR}/man5/syslog.conf.5 -+ ${INSTALL} -m 644 klogd.8 ${MANDIR}/man8/klogd.8 -+ -+ -+## Red Hat specific additions -+ -+VER1 = $(shell awk '/VERSION/ { print $$3 }' version.h | sed 's|"||g') -+VER2 = $(shell awk '/PATCHLEVEL/ { print $$3 }' version.h | sed 's|"||g') -+VERSION = $(VER1).$(VER2) -+RELEASE = $(shell awk '/Release:/ { print $$2 }' sysklogd.spec.in) -+CVSTAG = sysklogd-$(subst .,_,$(VERSION))-$(subst .,-,$(RELEASE)) -+ -+changelog: -+ rcs2log | sed "s|@.*redhat\.com|@redhat.com|" | sed "s|@@|@|" | \ -+ sed "s|/mnt/devel/CVS/sysklogd/||g" > redhat/changenew -+ mv redhat/ChangeLog redhat/ChangeLog.old -+ cat redhat/changenew redhat/ChangeLog.old > redhat/ChangeLog -+ rm -f redhat/changenew -+ -+tag-archive: -+ @cvs -Q tag -F $(CVSTAG) -+ -+create-archive: -+ @rm -rf /tmp/sysklogd -+ @cd /tmp ; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) sysklogd || echo "Um... export aborted." -+ @sed 's/VERSIONSUBST/$(VERSION)/' < /tmp/sysklogd/sysklogd.spec.in > /tmp/sysklogd/sysklogd.spec -+ @rm /tmp/sysklogd/sysklogd.spec.in -+ @mv /tmp/sysklogd /tmp/sysklogd-$(VERSION)rh -+ @cd /tmp ; tar -czSpf sysklogd-$(VERSION)rh.tar.gz sysklogd-$(VERSION)rh -+ @rm -rf /tmp/sysklogd-$(VERSION)rh -+ @cp /tmp/sysklogd-$(VERSION)rh.tar.gz . -+ @rm -f /tmp/sysklogd-$(VERSION)rh.tar.gz -+ @echo "" -+ @echo "The final archive is in sysklogd-$(VERSION)rh.tar.gz" -+ -+archive: clean tag-archive create-archive -diff -Nru sysklogd-1.4.1/klogd.c sysklogd-1.4.1-new/klogd.c ---- sysklogd-1.4.1/klogd.c 2001-03-11 20:40:10.000000000 +0100 -+++ sysklogd-1.4.1-new/klogd.c 2004-09-21 23:00:13.203887712 +0200 -@@ -275,6 +275,10 @@ - #define ksyslog klogctl - #endif - -+#ifndef _PATH_KLOG -+#define _PATH_KLOG "/proc/kmsg" -+#endif -+ - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 - -@@ -291,7 +295,7 @@ - terminate = 0, - caught_TSTP = 0, - reload_symbols = 0, -- console_log_level = -1; -+ console_log_level = 6; - - static int use_syscall = 0, - one_shot = 0, -@@ -509,8 +513,7 @@ - - - /* Set level of kernel console messaging.. */ -- if ( (console_log_level != -1) -- && (ksyslog(8, NULL, console_log_level) < 0) && \ -+ if ( (ksyslog(8, NULL, console_log_level) < 0) && \ - (errno == EINVAL) ) - { - /* -@@ -887,8 +890,7 @@ - value = strtoul(sym_start+1, (char **) 0, 16); - *(line-1) = '>'; /* put back delim */ - -- symbol = LookupSymbol(value, &sym); -- if ( !symbol_lookup || symbol == (char *) 0 ) -+ if ( !symbol_lookup || (symbol = LookupSymbol(value, &sym)) == (char *)0 ) - { - parse_state = PARSING_TEXT; - break; -@@ -938,7 +940,7 @@ - * messages into this fresh buffer. - */ - memset(log_buffer, '\0', sizeof(log_buffer)); -- if ( (rdcnt = ksyslog(2, log_buffer, sizeof(log_buffer))) < 0 ) -+ if ( (rdcnt = ksyslog(2, log_buffer, sizeof(log_buffer)-1)) < 0 ) - { - if ( errno == EINTR ) - return; -@@ -1143,8 +1145,11 @@ - if ( one_shot ) - { - if (symbol_lookup) { -- InitKsyms(symfile); -- InitMsyms(); -+ symbol_lookup = (InitKsyms(symfile) == 1); -+ symbol_lookup |= InitMsyms(); -+ if (symbol_lookup == 0) { -+ Syslog(LOG_WARNING, "cannot find any symbols, turning off symbol lookups\n"); -+ } - } - if ( (logsrc = GetKernelLogSrc()) == kernel ) - LogKernelLine(); -@@ -1159,8 +1164,11 @@ - #endif - logsrc = GetKernelLogSrc(); - if (symbol_lookup) { -- InitKsyms(symfile); -- InitMsyms(); -+ symbol_lookup = (InitKsyms(symfile) == 1); -+ symbol_lookup |= InitMsyms(); -+ if (symbol_lookup == 0) { -+ Syslog(LOG_WARNING, "cannot find any symbols, turning off symbol lookups\n"); -+ } - } - - /* The main loop. */ -diff -Nru sysklogd-1.4.1/ksym.c sysklogd-1.4.1-new/ksym.c ---- sysklogd-1.4.1/ksym.c 2000-09-12 23:53:31.000000000 +0200 -+++ sysklogd-1.4.1-new/ksym.c 2004-09-21 23:00:13.204887560 +0200 -@@ -112,6 +112,7 @@ - #include <stdlib.h> - #include <malloc.h> - #include <sys/utsname.h> -+#include <ctype.h> - #include "klogd.h" - #include "ksyms.h" - -@@ -344,6 +345,7 @@ - if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) { - if (CheckMapVersion(symfile) == 1) - file = symfile; -+ fclose(sym_file); - } - if (sym_file == (FILE *) 0 || file == (char *) 0) { - sprintf (symfile, "%s", *mf); -@@ -352,6 +354,7 @@ - if ( (sym_file = fopen(symfile, "r")) != (FILE *) 0 ) { - if (CheckMapVersion(symfile) == 1) - file = symfile; -+ fclose(sym_file); - } - } - -diff -Nru sysklogd-1.4.1/ksym_mod.c sysklogd-1.4.1-new/ksym_mod.c ---- sysklogd-1.4.1/ksym_mod.c 2000-09-12 23:15:28.000000000 +0200 -+++ sysklogd-1.4.1-new/ksym_mod.c 2004-09-21 23:00:13.205887408 +0200 -@@ -93,7 +93,7 @@ - #include <linux/time.h> - #include <linux/module.h> - #else /* __GLIBC__ */ --#include <linux/module.h> -+#include "module.h" - extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - extern int get_kernel_syms __P ((struct kernel_sym *__table)); - #endif /* __GLIBC__ */ -diff -Nru sysklogd-1.4.1/module.h sysklogd-1.4.1-new/module.h ---- sysklogd-1.4.1/module.h 1970-01-01 01:00:00.000000000 +0100 -+++ sysklogd-1.4.1-new/module.h 2004-09-21 23:00:13.205887408 +0200 -@@ -0,0 +1,62 @@ -+ -+/* Module definitions for klogd's module support */ -+struct kernel_sym -+{ -+ unsigned long value; -+ char name[60]; -+}; -+ -+struct module_symbol -+{ -+ unsigned long value; -+ const char *name; -+}; -+ -+struct module_ref -+{ -+ struct module *dep; /* "parent" pointer */ -+ struct module *ref; /* "child" pointer */ -+ struct module_ref *next_ref; -+}; -+ -+struct module_info -+{ -+ unsigned long addr; -+ unsigned long size; -+ unsigned long flags; -+ long usecount; -+}; -+ -+ -+typedef struct { volatile int counter; } atomic_t; -+ -+struct module -+{ -+ unsigned long size_of_struct; /* == sizeof(module) */ -+ struct module *next; -+ const char *name; -+ unsigned long size; -+ -+ union -+ { -+ atomic_t usecount; -+ long pad; -+ } uc; /* Needs to keep its size - so says rth */ -+ -+ unsigned long flags; /* AUTOCLEAN et al */ -+ -+ unsigned nsyms; -+ unsigned ndeps; -+ -+ struct module_symbol *syms; -+ struct module_ref *deps; -+ struct module_ref *refs; -+ int (*init)(void); -+ void (*cleanup)(void); -+ const struct exception_table_entry *ex_table_start; -+ const struct exception_table_entry *ex_table_end; -+#ifdef __alpha__ -+ unsigned long gp; -+#endif -+}; -+ -diff -Nru sysklogd-1.4.1/sysklogd.8 sysklogd-1.4.1-new/sysklogd.8 ---- sysklogd-1.4.1/sysklogd.8 2001-03-11 20:35:51.000000000 +0100 -+++ sysklogd-1.4.1-new/sysklogd.8 2004-09-21 23:00:13.206887256 +0200 -@@ -30,6 +30,7 @@ - .I domainlist - ] - .RB [ " \-v " ] -+.RB [ " \-x " ] - .LP - .SH DESCRIPTION - .B Sysklogd -@@ -152,6 +153,11 @@ - .TP - .B "\-v" - Print version and exit. -+.TP -+.B "\-x" -+Disable name lookups when receiving remote messages. -+This avoids deadlocks when the nameserver is running on -+the same machine that runs the syslog daemon. - .LP - .SH SIGNALS - .B Syslogd -diff -Nru sysklogd-1.4.1/syslog_tst.c sysklogd-1.4.1-new/syslog_tst.c ---- sysklogd-1.4.1/syslog_tst.c 1997-06-02 19:21:41.000000000 +0200 -+++ sysklogd-1.4.1-new/syslog_tst.c 2004-09-21 23:00:13.206887256 +0200 -@@ -42,7 +42,7 @@ - if ( (nl = strrchr(bufr, '\n')) != \ - (char *) 0) - *nl = '\0'; -- syslog(LOG_INFO, bufr); -+ syslog(LOG_INFO, "%s", bufr); - logged += strlen(bufr); - if ( logged > 1024 ) - { -@@ -54,7 +54,7 @@ - } - else - while (argc-- > 1) -- syslog(LOG_INFO, argv++[1]); -+ syslog(LOG_INFO, "%s", argv++[1]); - } - else - { -diff -Nru sysklogd-1.4.1/syslogd.c sysklogd-1.4.1-new/syslogd.c ---- sysklogd-1.4.1/syslogd.c 2001-03-11 20:40:10.000000000 +0100 -+++ sysklogd-1.4.1-new/syslogd.c 2004-09-21 23:00:13.209886800 +0200 -@@ -637,8 +637,8 @@ - * in seconds after previous message is logged. After each flush, - * we move to the next interval until we reach the largest. - */ --int repeatinterval[] = { 30, 60 }; /* # of secs before flush */ --#define MAXREPEAT ((sizeof(repeatinterval) / sizeof(repeatinterval[0])) - 1) -+time_t repeatinterval[] = { 30, 60 }; /* # of secs before flush */ -+#define MAXREPEAT ((int) ((sizeof(repeatinterval) / sizeof(repeatinterval[0])) - 1)) - #define REPEATTIME(f) ((f)->f_time + repeatinterval[(f)->f_repeatcount]) - #define BACKOFF(f) { if (++(f)->f_repeatcount > MAXREPEAT) \ - (f)->f_repeatcount = MAXREPEAT; \ -@@ -730,6 +730,7 @@ - int MarkInterval = 20 * 60; /* interval between marks in seconds */ - int MarkSeq = 0; /* mark sequence number */ - int NoFork = 0; /* don't fork - don't run in daemon mode */ -+int DisableDNS = 0; /* don't look up IP addresses of incoming messages */ - int AcceptRemote = 0; /* receive messages that come via UDP */ - char **StripDomains = NULL; /* these domains may be stripped before writing logs */ - char **LocalHosts = NULL; /* these hosts are logged with their hostname */ -@@ -743,7 +744,7 @@ - char **crunch_list(char *list); - int usage(void); - void untty(void); --void printchopped(const char *hname, char *msg, int len, int fd); -+void printchopped(const char *hname, char *msg, size_t len, int fd); - void printline(const char *hname, char *msg); - void printsys(char *msg); - void logmsg(int pri, char *msg, const char *from, int flags); -@@ -786,7 +787,7 @@ - int len, num_fds; - #else /* __GLIBC__ */ - #ifndef TESTING -- size_t len; -+ socklen_t len; - #endif - int num_fds; - #endif /* __GLIBC__ */ -@@ -829,7 +830,7 @@ - funix[i] = -1; - } - -- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF) -+ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:vx")) != EOF) - switch((char)ch) { - case 'a': - if (nfunix < MAXFUNIX) -@@ -877,6 +878,9 @@ - case 'v': - printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); - exit (0); -+ case 'x': -+ DisableDNS = 1; -+ break; - case '?': - default: - usage(); -@@ -890,11 +894,11 @@ - dprintf("Checking pidfile.\n"); - if (!check_pid(PidFile)) - { -+ signal (SIGTERM, doexit); - if (fork()) { - /* - * Parent process - */ -- signal (SIGTERM, doexit); - sleep(300); - /* - * Not reached unless something major went wrong. 5 -@@ -906,6 +910,7 @@ - */ - exit(1); - } -+ signal (SIGTERM, SIG_DFL); - num_fds = getdtablesize(); - for (i= 0; i < num_fds; i++) - (void) close(i); -@@ -1074,9 +1079,9 @@ - (fd_set *) NULL, (struct timeval *) NULL); - if ( restart ) - { -+ restart = 0; - dprintf("\nReceived SIGHUP, reloading syslogd.\n"); - init(); -- restart = 0; - continue; - } - if (nfds == 0) { -@@ -1145,8 +1150,7 @@ - dprintf("INET socket error: %d = %s.\n", \ - errno, strerror(errno)); - logerror("recvfrom inet"); -- /* should be harmless now that we set -- * BSDCOMPAT on the socket */ -+ /* should be harmless */ - sleep(10); - } - } -@@ -1174,7 +1178,7 @@ - - int usage() - { -- fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ -+ fprintf(stderr, "usage: syslogd [-drvxh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ - " [-s domainlist] [-f conffile]\n"); - exit(1); - } -@@ -1232,15 +1236,6 @@ - close(fd); - return -1; - } -- /* We need to enable BSD compatibility. Otherwise an attacker -- * could flood our log files by sending us tons of ICMP errors. -- */ -- if (setsockopt(fd, SOL_SOCKET, SO_BSDCOMPAT, \ -- (char *) &on, sizeof(on)) < 0) { -- logerror("setsockopt(BSDCOMPAT), suspending inet"); -- close(fd); -- return -1; -- } - if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) { - logerror("bind, suspending inet"); - close(fd); -@@ -1254,30 +1249,26 @@ - crunch_list(list) - char *list; - { -- int count, i; -+ int i, m, n; - char *p, *q; - char **result = NULL; - - p = list; - - /* strip off trailing delimiters */ -- while (p[strlen(p)-1] == LIST_DELIMITER) { -- count--; -+ while (*p && p[strlen(p)-1] == LIST_DELIMITER) - p[strlen(p)-1] = '\0'; -- } - /* cut off leading delimiters */ -- while (p[0] == LIST_DELIMITER) { -- count--; -+ while (p[0] == LIST_DELIMITER) - p++; -- } - -- /* count delimiters to calculate elements */ -- for (count=i=0; p[i]; i++) -- if (p[i] == LIST_DELIMITER) count++; -+ /* count delimiters to calculate the number of elements */ -+ for (n = i = 0; p[i]; i++) -+ if (p[i] == LIST_DELIMITER) n++; - -- if ((result = (char **)malloc(sizeof(char *) * count+2)) == NULL) { -+ if ((result = (char **)malloc(sizeof(char *) * (n + 2))) == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } - - /* -@@ -1285,30 +1276,28 @@ - * characters are different from any delimiters, - * so we don't have to care about this. - */ -- count = 0; -- while ((q=strchr(p, LIST_DELIMITER))) { -- result[count] = (char *) malloc((q - p + 1) * sizeof(char)); -- if (result[count] == NULL) { -+ m = 0; -+ while ((q = strchr(p, LIST_DELIMITER)) && m < n) { -+ result[m] = (char *) malloc((q - p + 1) * sizeof(char)); -+ if (result[m] == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } -- strncpy(result[count], p, q - p); -- result[count][q - p] = '\0'; -+ memcpy(result[m], p, q - p); -+ result[m][q - p] = '\0'; - p = q; p++; -- count++; -+ m++; - } -- if ((result[count] = \ -- (char *)malloc(sizeof(char) * strlen(p) + 1)) == NULL) { -+ if ((result[m] = strdup(p)) == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } -- strcpy(result[count],p); -- result[++count] = NULL; -+ result[++m] = NULL; - - #if 0 -- count=0; -- while (result[count]) -- dprintf ("#%d: %s\n", count, StripDomains[count++]); -+ m = 0; -+ while (result[m]) -+ dprintf ("#%d: %s\n", m, result[m++]); - #endif - return result; - } -@@ -1346,7 +1335,7 @@ - void printchopped(hname, msg, len, fd) - const char *hname; - char *msg; -- int len; -+ size_t len; - int fd; - { - auto int ptlngth; -@@ -1446,6 +1435,7 @@ - while ((c = *p++) && q < &line[sizeof(line) - 4]) { - if (c == '\n') - *q++ = ' '; -+#if 0 - else if (c < 040) { - *q++ = '^'; - *q++ = c ^ 0100; -@@ -1454,7 +1444,9 @@ - *q++ = '0' + ((c & 0300) >> 6); - *q++ = '0' + ((c & 0070) >> 3); - *q++ = '0' + (c & 0007); -- } else -+ } -+#endif -+ else - *q++ = c; - } - *q = '\0'; -@@ -1839,7 +1831,7 @@ - #else - && e == EBADF) { - #endif -- f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND|O_NOCTTY); -+ f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND|O_NOCTTY|O_LARGEFILE); - if (f->f_file < 0) { - f->f_type = F_UNUSED; - logerror(f->f_un.f_fname); -@@ -1929,7 +1921,7 @@ - /* is this slot used? */ - if (ut.ut_name[0] == '\0') - continue; -- if (ut.ut_type == LOGIN_PROCESS) -+ if (ut.ut_type != USER_PROCESS) - continue; - if (!(strcmp (ut.ut_name,"LOGIN"))) /* paranoia */ - continue; -@@ -2013,7 +2005,10 @@ - dprintf("Malformed from address.\n"); - return ("???"); - } -- hp = gethostbyaddr((char *) &f->sin_addr, sizeof(struct in_addr), \ -+ if (DisableDNS) -+ hp = 0; -+ else -+ hp = gethostbyaddr((char *) &f->sin_addr, sizeof(struct in_addr), \ - f->sin_family); - if (hp == 0) { - dprintf("Host name for your address (%s) unknown.\n", -@@ -2640,7 +2635,7 @@ - f->f_file = open(++p, O_RDWR|O_NONBLOCK); - f->f_type = F_PIPE; - } else { -- f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY, -+ f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY|O_LARGEFILE, - 0644); - f->f_type = F_FILE; - }

1 0

ports/core (2.4): slocate: update to 3.1
by crux＠crux.nu 30 Aug '07

30 Aug '07

commit ae3ae2ac7a8b698402386bb75f086a8d6b8bc86d Author: Juergen Daubert <jue(a)jue.li> Date: Thu Aug 30 10:41:01 2007 +0200 slocate: update to 3.1 diff --git a/slocate/.footprint b/slocate/.footprint index 04aa8a3..08c8d5f 100644 --- a/slocate/.footprint +++ b/slocate/.footprint @@ -2,14 +2,17 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/cron/ drwxr-xr-x root/root etc/cron/daily/ -rwxr-xr-x root/root etc/cron/daily/slocate +-rw-r--r-- root/root etc/updatedb.conf drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ lrwxrwxrwx root/root usr/bin/locate -> slocate -rwxr-sr-x root/slocate usr/bin/slocate +lrwxrwxrwx root/root usr/bin/updatedb -> slocate drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ lrwxrwxrwx root/root usr/man/man1/locate.1.gz -> slocate.1.gz -rw-r--r-- root/root usr/man/man1/slocate.1.gz +-rw-r--r-- root/root usr/man/man1/updatedb.1.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-x--- root/slocate var/lib/slocate/ diff --git a/slocate/.md5sum b/slocate/.md5sum index 56173bf..1d528ca 100644 --- a/slocate/.md5sum +++ b/slocate/.md5sum @@ -1,3 +1,4 @@ -5cf4f530f0a5b78967bf8f43a3fea617 slocate -660bf796027941744970242c7cd4ac70 slocate-2.7.patch -4872830642ea2ed5f9aff932720583c9 slocate-2.7.tar.gz +7aa005d9c9f39f18896e68af6cb301f0 CVE-2007-0227.patch +8f0b2571a7a6abf2cb519f85c5225436 slocate +69b45865ebce0cbfeb430381f0eb8b51 slocate_3.1.orig.tar.gz +4203633cf028280a596b00b33455c181 updatedb.conf diff --git a/slocate/CVE-2007-0227.patch b/slocate/CVE-2007-0227.patch new file mode 100644 index 0000000..4f10992 --- /dev/null +++ b/slocate/CVE-2007-0227.patch @@ -0,0 +1,42 @@ +--- slocate-3.1.orig/src/utils.c ++++ slocate-3.1/src/utils.c +@@ -524,6 +524,7 @@ + { + struct stat path_stat; + int ret = 0; ++ char *path_copy = NULL; + char *ptr = NULL; + + if (lstat(path, &path_stat) == -1) +@@ -532,15 +533,25 @@ + if (!S_ISLNK(path_stat.st_mode)) { + if (access(path, F_OK) != 0) + goto EXIT; +- } else if ((ptr = rindex(path, '/'))) { +- *ptr = 0; +- if (access(path, F_OK) == 0) +- ret = 1; +- *ptr = '/'; +- goto EXIT; + } + ++ /* "path" is const, so we shouldn't modify it. Also, for speed, ++ * I suspect strdup/free is less expensive than the deep access ++ * checks... */ ++ if (!(path_copy = strdup(path))) ++ goto EXIT; ++ + ret = 1; ++ ++ /* Each directory leading to the file (symlink or not) must be ++ * readable for us to allow it to be listed in search results. */ ++ while (ret && (ptr=rindex(path_copy,'/'))) { ++ *ptr=0; ++ if (*path_copy && access(path_copy, R_OK) != 0) ++ ret = 0; ++ } ++ free(path_copy); ++ + EXIT: + return ret; + } diff --git a/slocate/Pkgfile b/slocate/Pkgfile index ac46dab..69b68c2 100644 --- a/slocate/Pkgfile +++ b/slocate/Pkgfile @@ -1,28 +1,33 @@ # Description: Secure version of the GNU locate program -# URL: ftp://ftp.geekreview.org/slocate/ +# URL: http://packages.debian.org/unstable/utils/slocate # Maintainer: CRUX System Team, core-ports at crux dot nu name=slocate -version=2.7 -release=3 -source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \ - $name-$version.patch slocate) +version=3.1 +release=1 +source=(http://ftp.debian.org/debian/pool/main/s/$name/${name}_${version}.orig.tar.gz \ + slocate updatedb.conf CVE-2007-0227.patch) build() { cd $name-$version - patch -p1 < ../$name-$version.patch - touch Makefile.in - ./configure --prefix=/usr - make - mkdir -p $PKG/usr/bin $PKG/usr/man/man1 \ - $PKG/var/lib/slocate $PKG/etc/cron/daily - touch slocate.db - chmod 0750 $PKG/var/lib/slocate - chgrp slocate $PKG/var/lib/slocate - install -m 0640 -g slocate slocate.db $PKG/var/lib/slocate/slocate.db - install -m 2755 -g slocate slocate $PKG/usr/bin/slocate - install -m 0755 ../slocate $PKG/etc/cron/daily/slocate - install -m 0644 doc/slocate.1.linux.gz $PKG/usr/man/man1/slocate.1.gz + + patch -p1 -i $SRC/CVE-2007-0227.patch + sed -i "s/-O2/$CFLAGS/" src/Makefile + + make -j1 + + install -D -m 2755 -g slocate src/slocate $PKG/usr/bin/slocate ln -sf slocate $PKG/usr/bin/locate + ln -sf slocate $PKG/usr/bin/updatedb + + touch slocate.db + install -d -m 0750 -g slocate $PKG/var/lib/slocate + install -m 0640 -g slocate slocate.db $PKG/var/lib/slocate + + install -D -m 0755 $SRC/slocate $PKG/etc/cron/daily/slocate + install -m 0644 $SRC/updatedb.conf $PKG/etc + + install -D -m 0644 doc/slocate.1 $PKG/usr/man/man1/slocate.1 + install -m 0644 doc/updatedb.1 $PKG/usr/man/man1 ln -sf slocate.1.gz $PKG/usr/man/man1/locate.1.gz } diff --git a/slocate/slocate b/slocate/slocate old mode 100755 new mode 100644 index c5a4b0d..154de76 --- a/slocate/slocate +++ b/slocate/slocate @@ -1,9 +1,8 @@ #!/bin/sh # -# /etc/cron/daily/slocate: update the slocate database +# /etc/cron/daily/updatedb: update the slocate database # -/usr/bin/slocate -u -f proc,nfs,smbfs,autofs,auto,iso9660 \ - -e /tmp,/var/tmp,/var/spool,/mnt +/usr/bin/updatedb # End of file diff --git a/slocate/slocate-2.7.patch b/slocate/slocate-2.7.patch deleted file mode 100644 index ab27bff..0000000 --- a/slocate/slocate-2.7.patch +++ /dev/null @@ -1,93 +0,0 @@ -CAN-2003-0848: 'slocate' sgid privileges are now dropped when -searching databases that are not part of the 'slocate' group. This -will prevent malicious user supplied databases from giving access to -the 'slocate' group. Patch from Kevin Lindsay <klindsay(a)debian.org> - -diff -ru slocate-2.7/main.c slocate-2.7-new/main.c ---- slocate-2.7/main.c 2003-01-25 05:39:48.000000000 +0100 -+++ slocate-2.7-new/main.c 2004-03-28 12:01:45.256631896 +0200 -@@ -342,6 +342,9 @@ - char *part; - int i; - int res_errno; -+ char *tmp_ptr = NULL; -+ int last_sgid = 0; -+ struct stat db_stat; - - /* Make sure path is not empty */ - if (!path || strlen(path) == 0) return; -@@ -385,6 +388,28 @@ - - /* Null terminate array */ - SLOCATE_PATH[i] = NULL; -+ -+ /* Sort sgid slocate db's to the top */ -+ for (i = 0; SLOCATE_PATH[i]; i++) { -+ if (stat(SLOCATE_PATH[i], &db_stat) == -1) -+ report_error(FATAL, QUIET, "%s: Could not stat DB: %s: %s\n", progname, SLOCATE_PATH[i], strerror(errno)); -+ -+ if (db_stat.st_gid != SLOC_GID) -+ continue; -+ -+ if (i != last_sgid) { -+ tmp_ptr = SLOCATE_PATH[last_sgid]; -+ SLOCATE_PATH[last_sgid] = SLOCATE_PATH[i]; -+ SLOCATE_PATH[i] = tmp_ptr; -+ } -+ -+ last_sgid += 1; -+ -+ } -+ -+ /* for (i = 0; SLOCATE_PATH[i]; i++) -+ printf("%s\n", SLOCATE_PATH[i]); */ -+ - } - - /* Parse Dash */ -@@ -1154,6 +1179,22 @@ - char *cp=NULL; - #endif - char *bucket_of_holding=NULL; -+ gid_t cur_gid; -+ struct stat db_stat; -+ -+ cur_gid = getegid(); -+ -+ if (stat(database, &db_stat) == -1) -+ report_error(FATAL, QUIET, "%s: Could not stat '%d': %s\n", progname, strerror(errno)); -+ -+ /* If the database's file group is not apart of the 'slocate' group, -+ * drop privileges. When multiple databases are specified, the ones -+ * apart of the 'slocate' group will be searched first before the -+ * privileges are dropped. */ -+ if (cur_gid == SLOC_GID && db_stat.st_gid != SLOC_GID) { -+ if (setgid(GID) == -1) -+ report_error(FATAL, QUIET, "%s: Could not drop privileges.", progname); -+ } - - if ((fd = open(database,O_RDONLY)) == -1) { - report_error(WARNING,QUIET,"%s: decode_db(): %s: %s\n",progname,database,strerror(errno)); -@@ -1411,6 +1452,9 @@ - /* Get user IDs */ - UID = getuid(); - GID = getgid(); -+ -+ /* Get the 'slocate' group GID */ -+ SLOC_GID = get_gid(GRPFILE); - - /* Add the LOCATE_PATH environment variable to the list of databases to search in */ - parse_decode_path(getenv("LOCATE_PATH")); -@@ -1535,11 +1579,7 @@ - * with the -d option, etc */ - - if (ADD_SLOCATEDB) -- parse_decode_path(SLOCATEDB); -- -- /* Get the 'slocate' group GID */ -- SLOC_GID = get_gid(GRPFILE); -- -+ parse_decode_path(SLOCATEDB); - - /* if the -U option has been used, start to create the database at specified path */ - if (SPECDIR) diff --git a/slocate/updatedb.conf b/slocate/updatedb.conf new file mode 100644 index 0000000..875d47e --- /dev/null +++ b/slocate/updatedb.conf @@ -0,0 +1,13 @@ +# +# /etc/updatedb.conf +# +# This file sets environment variables which are +# used by updatedb and slocate -u + +# filesystems which are pruned from updatedb database +PRUNEFS="nfs afs proc smbfs autofs auto iso9660" +export PRUNEFS + +# paths which are pruned from updatedb database +PRUNEPATHS="/tmp /var/tmp /var/spool /mnt" +export PRUNEPATHS

1 0

ports/core (2.4): perl: added fix for gcc 4.2
by crux＠crux.nu 30 Aug '07

30 Aug '07

commit 8bcb36187243a87b7e45417d7083b84bf003a012 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Aug 30 10:16:59 2007 +0200 perl: added fix for gcc 4.2 diff --git a/perl/.md5sum b/perl/.md5sum index 0b33e6b..c22ef94 100644 --- a/perl/.md5sum +++ b/perl/.md5sum @@ -1,2 +1,3 @@ 02f3956c90132b061bde08bb0615c822 perl-5.8.8-CVE-2005-3962.patch +565a8ae3144b4a695c0525fcb587476a perl-5.8.8-gcc42.patch b8c118d4360846829beb30b02a6b91a7 perl-5.8.8.tar.gz diff --git a/perl/Pkgfile b/perl/Pkgfile index 252e5ef..08246ac 100644 --- a/perl/Pkgfile +++ b/perl/Pkgfile @@ -5,24 +5,26 @@ name=perl version=5.8.8 -release=2 +release=3 source=(ftp://ftp.perl.org/pub/CPAN/src/$name-$version.tar.gz \ - $name-$version-CVE-2005-3962.patch) + $name-$version-CVE-2005-3962.patch \ + $name-$version-gcc42.patch) build() { cd $name-$version - patch -p4 < ../$name-$version-CVE-2005-3962.patch + patch -p4 < $SRC/$name-$version-CVE-2005-3962.patch + patch -p1 < $SRC/$name-$version-gcc42.patch ./Configure -des \ - -Dprefix=/usr \ - -Darchname=linux \ - -Dman1ext=1pm \ - -Dman3ext=3pm \ - -Dman1dir=/usr/man/man1 \ - -Dman3dir=/usr/man/man3 \ - -Di_gdbm \ - -Di_db \ - -Duseshrplib=true \ - -Doptimize="$CFLAGS" + -Dprefix=/usr \ + -Darchname=linux \ + -Dman1ext=1pm \ + -Dman3ext=3pm \ + -Dman1dir=/usr/man/man1 \ + -Dman3dir=/usr/man/man3 \ + -Di_gdbm \ + -Di_db \ + -Duseshrplib=true \ + -Doptimize="$CFLAGS" make make DESTDIR=$PKG install ln -sf perl$version $PKG/usr/bin/perl diff --git a/perl/perl-5.8.8-gcc42.patch b/perl/perl-5.8.8-gcc42.patch new file mode 100644 index 0000000..6904136 --- /dev/null +++ b/perl/perl-5.8.8-gcc42.patch @@ -0,0 +1,11 @@ +diff -Naur perl-5.8.8-orig/makedepend.SH perl-5.8.8/makedepend.SH +--- perl-5.8.8-orig/makedepend.SH 2006-10-01 20:05:40.000000000 -0600 ++++ perl-5.8.8/makedepend.SH 2006-10-01 20:07:03.000000000 -0600 +@@ -167,6 +167,7 @@ + -e '/^#.*<builtin>/d' \ + -e '/^#.*<built-in>/d' \ + -e '/^#.*<command line>/d' \ ++ -e '/^#.*<command-line>/d' \ + -e '/^#.*"-"/d' \ + -e '/: file path prefix .* never used$/d' \ + -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \

1 0

ports/core (2.4): coreutils: added fix for glibc 2.6
by crux＠crux.nu 30 Aug '07

30 Aug '07

commit 1763ea4648c282890621a32b814eae3d8bc6f091 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Aug 30 10:12:49 2007 +0200 coreutils: added fix for glibc 2.6 diff --git a/coreutils/.md5sum b/coreutils/.md5sum index a999fed..41c8b9d 100644 --- a/coreutils/.md5sum +++ b/coreutils/.md5sum @@ -1,2 +1,3 @@ c9607d8495f16e98906e7ed2d9751a06 coreutils-6.9.tar.bz2 +253a70b30fc9ed3e5ecb17dc846acda2 coreutils-futimens.patch c05b735710fbd62239588c07084852a0 coreutils-uname.patch diff --git a/coreutils/Pkgfile b/coreutils/Pkgfile index 8516e92..c6405be 100644 --- a/coreutils/Pkgfile +++ b/coreutils/Pkgfile @@ -4,14 +4,15 @@ name=coreutils version=6.9 -release=1 +release=2 source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.bz2 \ - $name-uname.patch) + $name-uname.patch $name-futimens.patch) build() { cd $name-$version patch -p1 < $SRC/$name-uname.patch + patch -p1 < $SRC/$name-futimens.patch DEFAULT_POSIX2_VERSION=199209 \ ./configure --prefix=/usr \ diff --git a/coreutils/coreutils-futimens.patch b/coreutils/coreutils-futimens.patch new file mode 100644 index 0000000..966769b --- /dev/null +++ b/coreutils/coreutils-futimens.patch @@ -0,0 +1,55 @@ +http://lists.gnu.org/archive/html/bug-coreutils/2007-05/msg00161.html + +diff -Nru coreutils-6.9.orig/lib/utimens.c coreutils-6.9/lib/utimens.c +--- coreutils-6.9.orig/lib/utimens.c 2007-08-16 11:38:32.268087335 +0200 ++++ coreutils-6.9/lib/utimens.c 2007-08-16 11:39:09.626024843 +0200 +@@ -75,8 +75,8 @@ + Return 0 on success, -1 (setting errno) on failure. */ + + int +-futimens (int fd ATTRIBUTE_UNUSED, +- char const *file, struct timespec const timespec[2]) ++gl_futimens (int fd ATTRIBUTE_UNUSED, ++ char const *file, struct timespec const timespec[2]) + { + /* Some Linux-based NFS clients are buggy, and mishandle time stamps + of files in NFS file systems in some cases. We have no +@@ -185,5 +185,5 @@ + int + utimens (char const *file, struct timespec const timespec[2]) + { +- return futimens (-1, file, timespec); ++ return gl_futimens (-1, file, timespec); + } +diff -Nru coreutils-6.9.orig/lib/utimens.h coreutils-6.9/lib/utimens.h +--- coreutils-6.9.orig/lib/utimens.h 2007-08-16 11:38:32.148093960 +0200 ++++ coreutils-6.9/lib/utimens.h 2007-08-16 11:39:09.606025947 +0200 +@@ -1,3 +1,3 @@ + #include <time.h> +-int futimens (int, char const *, struct timespec const [2]); ++int gl_futimens (int, char const *, struct timespec const [2]); + int utimens (char const *, struct timespec const [2]); +diff -Nru coreutils-6.9.orig/src/copy.c coreutils-6.9/src/copy.c +--- coreutils-6.9.orig/src/copy.c 2007-08-16 11:38:32.988047587 +0200 ++++ coreutils-6.9/src/copy.c 2007-08-16 11:39:01.596468146 +0200 +@@ -518,7 +518,7 @@ + timespec[0] = get_stat_atime (src_sb); + timespec[1] = get_stat_mtime (src_sb); + +- if (futimens (dest_desc, dst_name, timespec) != 0) ++ if (gl_futimens (dest_desc, dst_name, timespec) != 0) + { + error (0, errno, _("preserving times for %s"), quote (dst_name)); + if (x->require_preserve) +diff -Nru coreutils-6.9.orig/src/touch.c coreutils-6.9/src/touch.c +--- coreutils-6.9.orig/src/touch.c 2007-08-16 11:38:32.898052555 +0200 ++++ coreutils-6.9/src/touch.c 2007-08-16 11:41:10.989324504 +0200 +@@ -182,7 +182,7 @@ + t = timespec; + } + +- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); ++ ok = (gl_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0); + + if (fd == STDIN_FILENO) + {

1 0

ports/core (2.4): Merge branch '2.3' into 2.4
by crux＠crux.nu 30 Aug '07

30 Aug '07

commit c73f3242e3f631984df6746ed2cd41b95839d2d7 Merge: 1672637... a9ad889... Author: Juergen Daubert <jue(a)jue.li> Date: Thu Aug 30 10:00:32 2007 +0200 Merge branch '2.3' into 2.4

1 0