October 2007 - crux-commits

ports/core (2.4): [notify] openssl: fix for CVE-2007-5135 See http://www.securityfocus.com/bid/25831
by crux＠crux.nu 08 Oct '07

08 Oct '07

commit 9a46286a22116b36846ab8afaef0f31ae7bb03b1 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Oct 8 11:15:39 2007 +0200 [notify] openssl: fix for CVE-2007-5135 See http://www.securityfocus.com/bid/25831 diff --git a/openssl/.md5sum b/openssl/.md5sum index a9a40d3..cc999da 100644 --- a/openssl/.md5sum +++ b/openssl/.md5sum @@ -1,4 +1,5 @@ 30ad2995a2668db16ae3083c11a42307 CVE-2007-3108.patch +21119cb0b942c835395d7f57530ba14a CVE-2007-5135.patch 9d0df57845af8acd1027a7df5c18d017 mksslcert.sh 58daa890c3bc19bd6ce3451b2e5e335c openssl-0.9.8b-parallel-build.patch 3a7ff24f6ea5cd711984722ad654b927 openssl-0.9.8e.tar.gz diff --git a/openssl/CVE-2007-5135.patch b/openssl/CVE-2007-5135.patch new file mode 100644 index 0000000..ed3b0fd --- /dev/null +++ b/openssl/CVE-2007-5135.patch @@ -0,0 +1,46 @@ +openssl/ssl/ssl_lib.c 1.133.2.9 -> 1.133.2.10 + +--- ssl_lib.c 2007/08/12 18:59:02 1.133.2.9 ++++ ssl_lib.c 2007/09/19 12:16:21 1.133.2.10 +@@ -1210,7 +1210,6 @@ + char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) + { + char *p; +- const char *cp; + STACK_OF(SSL_CIPHER) *sk; + SSL_CIPHER *c; + int i; +@@ -1223,20 +1222,21 @@ + sk=s->session->ciphers; + for (i=0; i<sk_SSL_CIPHER_num(sk); i++) + { +- /* Decrement for either the ':' or a '\0' */ +- len--; ++ int n; ++ + c=sk_SSL_CIPHER_value(sk,i); +- for (cp=c->name; *cp; ) ++ n=strlen(c->name); ++ if (n+1 > len) + { +- if (len-- <= 0) +- { +- *p='\0'; +- return(buf); +- } +- else +- *(p++)= *(cp++); ++ if (p != buf) ++ --p; ++ *p='\0'; ++ return buf; + } ++ strcpy(p,c->name); ++ p+=n; + *(p++)=':'; ++ len-=n+1; + } + p[-1]='\0'; + return(buf); + + diff --git a/openssl/Pkgfile b/openssl/Pkgfile index 10c23da..64a90dd 100644 --- a/openssl/Pkgfile +++ b/openssl/Pkgfile @@ -4,14 +4,15 @@ name=openssl version=0.9.8e -release=2 +release=3 source=(http://www.openssl.org/source/$name-$version.tar.gz \ mksslcert.sh openssl-0.9.8b-parallel-build.patch \ - CVE-2007-3108.patch) + CVE-2007-3108.patch CVE-2007-5135.patch) build() { cd $name-$version patch -p1 -i $SRC/CVE-2007-3108.patch + patch -p0 -d ssl -i $SRC/CVE-2007-5135.patch patch -p1 -i $SRC/openssl-0.9.8b-parallel-build.patch ./config --prefix=/usr --openssldir=/etc/ssl shared make

1 0

ports/core (2.3): [notify] openssl: fix for CVE-2007-5135 See http://www.securityfocus.com/bid/25831
by crux＠crux.nu 08 Oct '07

08 Oct '07

commit 9a46286a22116b36846ab8afaef0f31ae7bb03b1 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Oct 8 11:15:39 2007 +0200 [notify] openssl: fix for CVE-2007-5135 See http://www.securityfocus.com/bid/25831 diff --git a/openssl/.md5sum b/openssl/.md5sum index a9a40d3..cc999da 100644 --- a/openssl/.md5sum +++ b/openssl/.md5sum @@ -1,4 +1,5 @@ 30ad2995a2668db16ae3083c11a42307 CVE-2007-3108.patch +21119cb0b942c835395d7f57530ba14a CVE-2007-5135.patch 9d0df57845af8acd1027a7df5c18d017 mksslcert.sh 58daa890c3bc19bd6ce3451b2e5e335c openssl-0.9.8b-parallel-build.patch 3a7ff24f6ea5cd711984722ad654b927 openssl-0.9.8e.tar.gz diff --git a/openssl/CVE-2007-5135.patch b/openssl/CVE-2007-5135.patch new file mode 100644 index 0000000..ed3b0fd --- /dev/null +++ b/openssl/CVE-2007-5135.patch @@ -0,0 +1,46 @@ +openssl/ssl/ssl_lib.c 1.133.2.9 -> 1.133.2.10 + +--- ssl_lib.c 2007/08/12 18:59:02 1.133.2.9 ++++ ssl_lib.c 2007/09/19 12:16:21 1.133.2.10 +@@ -1210,7 +1210,6 @@ + char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) + { + char *p; +- const char *cp; + STACK_OF(SSL_CIPHER) *sk; + SSL_CIPHER *c; + int i; +@@ -1223,20 +1222,21 @@ + sk=s->session->ciphers; + for (i=0; i<sk_SSL_CIPHER_num(sk); i++) + { +- /* Decrement for either the ':' or a '\0' */ +- len--; ++ int n; ++ + c=sk_SSL_CIPHER_value(sk,i); +- for (cp=c->name; *cp; ) ++ n=strlen(c->name); ++ if (n+1 > len) + { +- if (len-- <= 0) +- { +- *p='\0'; +- return(buf); +- } +- else +- *(p++)= *(cp++); ++ if (p != buf) ++ --p; ++ *p='\0'; ++ return buf; + } ++ strcpy(p,c->name); ++ p+=n; + *(p++)=':'; ++ len-=n+1; + } + p[-1]='\0'; + return(buf); + + diff --git a/openssl/Pkgfile b/openssl/Pkgfile index 10c23da..64a90dd 100644 --- a/openssl/Pkgfile +++ b/openssl/Pkgfile @@ -4,14 +4,15 @@ name=openssl version=0.9.8e -release=2 +release=3 source=(http://www.openssl.org/source/$name-$version.tar.gz \ mksslcert.sh openssl-0.9.8b-parallel-build.patch \ - CVE-2007-3108.patch) + CVE-2007-3108.patch CVE-2007-5135.patch) build() { cd $name-$version patch -p1 -i $SRC/CVE-2007-3108.patch + patch -p0 -d ssl -i $SRC/CVE-2007-5135.patch patch -p1 -i $SRC/openssl-0.9.8b-parallel-build.patch ./config --prefix=/usr --openssldir=/etc/ssl shared make

1 0

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

08 Oct '07

commit e7d3635e2672c8f2776dda31fb7a8e9e5242d91e Merge: 7053def... 32df899... Author: Juergen Daubert <jue(a)jue.li> Date: Mon Oct 8 10:09:43 2007 +0200 Merge branch '2.3' into 2.4

1 0

ports/core (2.4): gawk: removed patch
by crux＠crux.nu 08 Oct '07

08 Oct '07

commit 32df899cfdf8c987f9c50108fa0b5fc2e937ad17 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Oct 8 10:08:40 2007 +0200 gawk: removed patch diff --git a/gawk/gawk-3.1.5-io.patch b/gawk/gawk-3.1.5-io.patch deleted file mode 100644 index 80f2d08..0000000 --- a/gawk/gawk-3.1.5-io.patch +++ /dev/null @@ -1,270 +0,0 @@ -# http://thread.gmane.org/gmane.comp.gnu.utils.bugs/13520/ -# http://thread.gmane.org/gmane.comp.gnu.utils.bugs/12433 - -Mon Jul 3 00:27:59 2006 Arnold D. Robbins <arnold @ skeeve.com> - - * io.c (INTERNAL_HANDLE): New constant for use by `iop_alloc' - when allocating an internal IOBUF. - (pidopen, useropen): Use it. - (iop_alloc): Add check for it and just return iop. - -Sun Jun 18 22:27:25 2006 Arnold D. Robbins <arnold @ skeeve.com> - - Repair internal names like /dev/user, /dev/pid, as well as /dev/fd/N, - which have been broken for a long time but noone noticed. - - * io.c (is_internal): new macro to check for internal file like `/dev/user'. - (spec_setup): Reduce to two parameters, allocate logic is always true. - Add IOP_NO_FREE to flag. - (pidopen, useropen): Return `IOBUF *' instead of int. Fix - logic to test if `iop' parameter is NULL and if so to allocate it. - (specfdopen,): Return `IOBUF *' instead of int. Fix - logic to test if `iop' parameter is NULL and if so to allocate it. - Don't set IOP_NO_FREE in flag. - (iop_open): Remove `IOBUF iob' field from `struct internal' and its use - and the use of `spec_setup' from the code here. Change the check in the - call to the open function to look for NULL. - (get_a_record): Use `is_internal' in initial check for filling the - buffer to not try to call `read' on internal files. If true, set - the IOP_AT_EOF in the flag and return EOF. - -Fri Aug 12 13:10:33 2005 Arnold D. Robbins <arnold @ skeeve.com> - - * io.c (iop_alloc): Only free `iop' if it was malloc'ed in - the first place. - ---- ../gawk-3.1.5/io.c 2005-07-26 21:07:43.000000000 +0300 -+++ io.c 2006-07-03 00:27:51.000000000 +0300 -@@ -103,6 +103,9 @@ - - typedef enum { CLOSE_ALL, CLOSE_TO, CLOSE_FROM } two_way_close_type; - -+/* For internal files, /dev/pid, etc. */ -+#define INTERNAL_HANDLE (-42) -+ - /* Several macros make the code a bit clearer: */ - /* */ - /* */ -@@ -110,6 +113,7 @@ - #define at_eof(iop) ((iop->flag & IOP_AT_EOF) != 0) - #define has_no_data(iop) (iop->dataend == NULL) - #define no_data_left(iop) (iop->off >= iop->dataend) -+#define is_internal(iop) ((iop->flag & IOP_IS_INTERNAL) != 0) - /* The key point to the design is to split out the code that searches through */ - /* a buffer looking for the record and the terminator into separate routines, */ - /* with a higher-level routine doing the reading of data and buffer management. */ -@@ -163,10 +167,10 @@ - static int gawk_pclose P((struct redirect *rp)); - static int do_pathopen P((const char *file)); - static int str2mode P((const char *mode)); --static void spec_setup P((IOBUF *iop, int len, int allocate)); --static int specfdopen P((IOBUF *iop, const char *name, const char *mode)); --static int pidopen P((IOBUF *iop, const char *name, const char *mode)); --static int useropen P((IOBUF *iop, const char *name, const char *mode)); -+static void spec_setup P((IOBUF *iop, int len)); -+static IOBUF *specfdopen P((IOBUF *iop, const char *name, const char *mode)); -+static IOBUF *pidopen P((IOBUF *iop, const char *name, const char *mode)); -+static IOBUF *useropen P((IOBUF *iop, const char *name, const char *mode)); - static int two_way_open P((const char *str, struct redirect *rp)); - static int pty_vs_pipe P((const char *command)); - -@@ -1422,30 +1426,24 @@ - /* spec_setup --- setup an IOBUF for a special internal file */ - - static void --spec_setup(IOBUF *iop, int len, int allocate) -+spec_setup(IOBUF *iop, int len) - { - char *cp; - -- if (allocate) { -- emalloc(cp, char *, len+2, "spec_setup"); -- iop->buf = cp; -- } else { -- len = strlen(iop->buf); -- iop->buf[len++] = '\n'; /* get_a_record clobbered it */ -- iop->buf[len] = '\0'; /* just in case */ -- } -+ emalloc(cp, char *, len+2, "spec_setup"); -+ iop->buf = cp; - iop->off = iop->buf; - iop->count = 0; - iop->size = len; - iop->end = iop->buf + len; - iop->dataend = iop->end; - iop->fd = -1; -- iop->flag = IOP_IS_INTERNAL | IOP_AT_START; -+ iop->flag = IOP_IS_INTERNAL | IOP_AT_START | IOP_NO_FREE; - } - - /* specfdopen --- open an fd special file */ - --static int -+static IOBUF * - specfdopen(IOBUF *iop, const char *name, const char *mode) - { - int fd; -@@ -1453,17 +1451,14 @@ - - fd = devopen(name, mode); - if (fd == INVALID_HANDLE) -- return INVALID_HANDLE; -- tp = iop_alloc(fd, name, NULL); -+ return NULL; -+ tp = iop_alloc(fd, name, iop); - if (tp == NULL) { - /* don't leak fd's */ - close(fd); -- return INVALID_HANDLE; -+ return NULL; - } -- *iop = *tp; -- iop->flag |= IOP_NO_FREE; -- free(tp); -- return 0; -+ return tp; - } - - #ifdef GETPGRP_VOID -@@ -1474,7 +1469,7 @@ - - /* pidopen --- "open" /dev/pid, /dev/ppid, and /dev/pgrpid */ - --static int -+static IOBUF * - pidopen(IOBUF *iop, const char *name, const char *mode ATTRIBUTE_UNUSED) - { - char tbuf[BUFSIZ]; -@@ -1483,6 +1478,12 @@ - - warning(_("use `PROCINFO[\"%s\"]' instead of `%s'"), cp, name); - -+ if (iop == NULL) { -+ iop = iop_alloc(INTERNAL_HANDLE, name, iop); -+ if (iop == NULL) -+ return NULL; -+ } -+ - if (name[6] == 'g') - sprintf(tbuf, "%d\n", (int) getpgrp(getpgrp_arg())); - else if (name[6] == 'i') -@@ -1490,9 +1491,9 @@ - else - sprintf(tbuf, "%d\n", (int) getppid()); - i = strlen(tbuf); -- spec_setup(iop, i, TRUE); -+ spec_setup(iop, i); - strcpy(iop->buf, tbuf); -- return 0; -+ return iop; - } - - /* useropen --- "open" /dev/user */ -@@ -1507,7 +1508,7 @@ - * supplementary group set. - */ - --static int -+static IOBUF * - useropen(IOBUF *iop, const char *name ATTRIBUTE_UNUSED, const char *mode ATTRIBUTE_UNUSED) - { - char tbuf[BUFSIZ], *cp; -@@ -1515,6 +1516,12 @@ - - warning(_("use `PROCINFO[...]' instead of `/dev/user'")); - -+ if (iop == NULL) { -+ iop = iop_alloc(INTERNAL_HANDLE, name, iop); -+ if (iop == NULL) -+ return NULL; -+ } -+ - sprintf(tbuf, "%d %d %d %d", (int) getuid(), (int) geteuid(), (int) getgid(), (int) getegid()); - - cp = tbuf + strlen(tbuf); -@@ -1529,9 +1536,9 @@ - *cp++ = '\0'; - - i = strlen(tbuf); -- spec_setup(iop, i, TRUE); -+ spec_setup(iop, i); - strcpy(iop->buf, tbuf); -- return 0; -+ return iop; - } - - /* iop_open --- handle special and regular files for input */ -@@ -1544,8 +1551,7 @@ - static struct internal { - const char *name; - int compare; -- int (*fp) P((IOBUF *, const char *, const char *)); -- IOBUF iob; -+ IOBUF *(*fp) P((IOBUF *, const char *, const char *)); - } table[] = { - { "/dev/fd/", 8, specfdopen }, - { "/dev/stdin", 10, specfdopen }, -@@ -1570,12 +1576,7 @@ - - for (i = 0; i < devcount; i++) { - if (STREQN(name, table[i].name, table[i].compare)) { -- iop = & table[i].iob; -- -- if (iop->buf != NULL) { -- spec_setup(iop, 0, FALSE); -- return iop; -- } else if ((*table[i].fp)(iop, name, mode) == 0) -+ if ((iop = (*table[i].fp)(iop, name, mode)) != NULL) - return iop; - else { - warning(_("could not open `%s', mode `%s'"), -@@ -2480,9 +2481,12 @@ - { - struct stat sbuf; - struct open_hook *oh; -+ int iop_malloced = FALSE; - -- if (iop == NULL) -+ if (iop == NULL) { - emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc"); -+ iop_malloced = TRUE; -+ } - memset(iop, '\0', sizeof(IOBUF)); - iop->flag = 0; - iop->fd = fd; -@@ -2494,8 +2498,12 @@ - break; - } - -+ if (iop->fd == INTERNAL_HANDLE) -+ return iop; -+ - if (iop->fd == INVALID_HANDLE) { -- free(iop); -+ if (iop_malloced) -+ free(iop); - return NULL; - } - if (isatty(iop->fd)) -@@ -2503,7 +2511,7 @@ - iop->readsize = iop->size = optimal_bufsize(iop->fd, & sbuf); - iop->sbuf = sbuf; - if (do_lint && S_ISREG(sbuf.st_mode) && sbuf.st_size == 0) -- lintwarn(_("data file `%s' is empty"), name); -+ lintwarn(_("data file `%s' is empty"), name); - errno = 0; - iop->count = iop->scanoff = 0; - emalloc(iop->buf, char *, iop->size += 2, "iop_alloc"); -@@ -2906,6 +2914,10 @@ - - /* <fill initial buffer>= */ - if (has_no_data(iop) || no_data_left(iop)) { -+ if (is_internal(iop)) { -+ iop->flag |= IOP_AT_EOF; -+ return EOF; -+ } - iop->count = read(iop->fd, iop->buf, iop->readsize); - if (iop->count == 0) { - iop->flag |= IOP_AT_EOF; - -

1 0

ports/core (2.4): pciutils: explicit set mandir to avoid installation into /usr/share/man if exist, thx Giorgio Lando
by crux＠crux.nu 08 Oct '07

08 Oct '07

commit f12b231c30e48cbead9bb00cf33dc18ffd8a8552 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Oct 7 17:58:39 2007 +0200 pciutils: explicit set mandir to avoid installation into /usr/share/man if exist, thx Giorgio Lando diff --git a/pciutils/Pkgfile b/pciutils/Pkgfile index b906305..61e92e4 100644 --- a/pciutils/Pkgfile +++ b/pciutils/Pkgfile @@ -11,5 +11,5 @@ source=(http://www.kernel.org/pub/software/utils/$name/$name-$version.tar.g… build() { cd $name-$version make OPT="$CFLAGS" PREFIX=/usr ZLIB=no - make DESTDIR=$PKG PREFIX=/usr install install-lib + make DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man install install-lib }

1 0

ports/core (2.3): gawk: removed patch
by crux＠crux.nu 08 Oct '07

08 Oct '07

commit 32df899cfdf8c987f9c50108fa0b5fc2e937ad17 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Oct 8 10:08:40 2007 +0200 gawk: removed patch diff --git a/gawk/gawk-3.1.5-io.patch b/gawk/gawk-3.1.5-io.patch deleted file mode 100644 index 80f2d08..0000000 --- a/gawk/gawk-3.1.5-io.patch +++ /dev/null @@ -1,270 +0,0 @@ -# http://thread.gmane.org/gmane.comp.gnu.utils.bugs/13520/ -# http://thread.gmane.org/gmane.comp.gnu.utils.bugs/12433 - -Mon Jul 3 00:27:59 2006 Arnold D. Robbins <arnold @ skeeve.com> - - * io.c (INTERNAL_HANDLE): New constant for use by `iop_alloc' - when allocating an internal IOBUF. - (pidopen, useropen): Use it. - (iop_alloc): Add check for it and just return iop. - -Sun Jun 18 22:27:25 2006 Arnold D. Robbins <arnold @ skeeve.com> - - Repair internal names like /dev/user, /dev/pid, as well as /dev/fd/N, - which have been broken for a long time but noone noticed. - - * io.c (is_internal): new macro to check for internal file like `/dev/user'. - (spec_setup): Reduce to two parameters, allocate logic is always true. - Add IOP_NO_FREE to flag. - (pidopen, useropen): Return `IOBUF *' instead of int. Fix - logic to test if `iop' parameter is NULL and if so to allocate it. - (specfdopen,): Return `IOBUF *' instead of int. Fix - logic to test if `iop' parameter is NULL and if so to allocate it. - Don't set IOP_NO_FREE in flag. - (iop_open): Remove `IOBUF iob' field from `struct internal' and its use - and the use of `spec_setup' from the code here. Change the check in the - call to the open function to look for NULL. - (get_a_record): Use `is_internal' in initial check for filling the - buffer to not try to call `read' on internal files. If true, set - the IOP_AT_EOF in the flag and return EOF. - -Fri Aug 12 13:10:33 2005 Arnold D. Robbins <arnold @ skeeve.com> - - * io.c (iop_alloc): Only free `iop' if it was malloc'ed in - the first place. - ---- ../gawk-3.1.5/io.c 2005-07-26 21:07:43.000000000 +0300 -+++ io.c 2006-07-03 00:27:51.000000000 +0300 -@@ -103,6 +103,9 @@ - - typedef enum { CLOSE_ALL, CLOSE_TO, CLOSE_FROM } two_way_close_type; - -+/* For internal files, /dev/pid, etc. */ -+#define INTERNAL_HANDLE (-42) -+ - /* Several macros make the code a bit clearer: */ - /* */ - /* */ -@@ -110,6 +113,7 @@ - #define at_eof(iop) ((iop->flag & IOP_AT_EOF) != 0) - #define has_no_data(iop) (iop->dataend == NULL) - #define no_data_left(iop) (iop->off >= iop->dataend) -+#define is_internal(iop) ((iop->flag & IOP_IS_INTERNAL) != 0) - /* The key point to the design is to split out the code that searches through */ - /* a buffer looking for the record and the terminator into separate routines, */ - /* with a higher-level routine doing the reading of data and buffer management. */ -@@ -163,10 +167,10 @@ - static int gawk_pclose P((struct redirect *rp)); - static int do_pathopen P((const char *file)); - static int str2mode P((const char *mode)); --static void spec_setup P((IOBUF *iop, int len, int allocate)); --static int specfdopen P((IOBUF *iop, const char *name, const char *mode)); --static int pidopen P((IOBUF *iop, const char *name, const char *mode)); --static int useropen P((IOBUF *iop, const char *name, const char *mode)); -+static void spec_setup P((IOBUF *iop, int len)); -+static IOBUF *specfdopen P((IOBUF *iop, const char *name, const char *mode)); -+static IOBUF *pidopen P((IOBUF *iop, const char *name, const char *mode)); -+static IOBUF *useropen P((IOBUF *iop, const char *name, const char *mode)); - static int two_way_open P((const char *str, struct redirect *rp)); - static int pty_vs_pipe P((const char *command)); - -@@ -1422,30 +1426,24 @@ - /* spec_setup --- setup an IOBUF for a special internal file */ - - static void --spec_setup(IOBUF *iop, int len, int allocate) -+spec_setup(IOBUF *iop, int len) - { - char *cp; - -- if (allocate) { -- emalloc(cp, char *, len+2, "spec_setup"); -- iop->buf = cp; -- } else { -- len = strlen(iop->buf); -- iop->buf[len++] = '\n'; /* get_a_record clobbered it */ -- iop->buf[len] = '\0'; /* just in case */ -- } -+ emalloc(cp, char *, len+2, "spec_setup"); -+ iop->buf = cp; - iop->off = iop->buf; - iop->count = 0; - iop->size = len; - iop->end = iop->buf + len; - iop->dataend = iop->end; - iop->fd = -1; -- iop->flag = IOP_IS_INTERNAL | IOP_AT_START; -+ iop->flag = IOP_IS_INTERNAL | IOP_AT_START | IOP_NO_FREE; - } - - /* specfdopen --- open an fd special file */ - --static int -+static IOBUF * - specfdopen(IOBUF *iop, const char *name, const char *mode) - { - int fd; -@@ -1453,17 +1451,14 @@ - - fd = devopen(name, mode); - if (fd == INVALID_HANDLE) -- return INVALID_HANDLE; -- tp = iop_alloc(fd, name, NULL); -+ return NULL; -+ tp = iop_alloc(fd, name, iop); - if (tp == NULL) { - /* don't leak fd's */ - close(fd); -- return INVALID_HANDLE; -+ return NULL; - } -- *iop = *tp; -- iop->flag |= IOP_NO_FREE; -- free(tp); -- return 0; -+ return tp; - } - - #ifdef GETPGRP_VOID -@@ -1474,7 +1469,7 @@ - - /* pidopen --- "open" /dev/pid, /dev/ppid, and /dev/pgrpid */ - --static int -+static IOBUF * - pidopen(IOBUF *iop, const char *name, const char *mode ATTRIBUTE_UNUSED) - { - char tbuf[BUFSIZ]; -@@ -1483,6 +1478,12 @@ - - warning(_("use `PROCINFO[\"%s\"]' instead of `%s'"), cp, name); - -+ if (iop == NULL) { -+ iop = iop_alloc(INTERNAL_HANDLE, name, iop); -+ if (iop == NULL) -+ return NULL; -+ } -+ - if (name[6] == 'g') - sprintf(tbuf, "%d\n", (int) getpgrp(getpgrp_arg())); - else if (name[6] == 'i') -@@ -1490,9 +1491,9 @@ - else - sprintf(tbuf, "%d\n", (int) getppid()); - i = strlen(tbuf); -- spec_setup(iop, i, TRUE); -+ spec_setup(iop, i); - strcpy(iop->buf, tbuf); -- return 0; -+ return iop; - } - - /* useropen --- "open" /dev/user */ -@@ -1507,7 +1508,7 @@ - * supplementary group set. - */ - --static int -+static IOBUF * - useropen(IOBUF *iop, const char *name ATTRIBUTE_UNUSED, const char *mode ATTRIBUTE_UNUSED) - { - char tbuf[BUFSIZ], *cp; -@@ -1515,6 +1516,12 @@ - - warning(_("use `PROCINFO[...]' instead of `/dev/user'")); - -+ if (iop == NULL) { -+ iop = iop_alloc(INTERNAL_HANDLE, name, iop); -+ if (iop == NULL) -+ return NULL; -+ } -+ - sprintf(tbuf, "%d %d %d %d", (int) getuid(), (int) geteuid(), (int) getgid(), (int) getegid()); - - cp = tbuf + strlen(tbuf); -@@ -1529,9 +1536,9 @@ - *cp++ = '\0'; - - i = strlen(tbuf); -- spec_setup(iop, i, TRUE); -+ spec_setup(iop, i); - strcpy(iop->buf, tbuf); -- return 0; -+ return iop; - } - - /* iop_open --- handle special and regular files for input */ -@@ -1544,8 +1551,7 @@ - static struct internal { - const char *name; - int compare; -- int (*fp) P((IOBUF *, const char *, const char *)); -- IOBUF iob; -+ IOBUF *(*fp) P((IOBUF *, const char *, const char *)); - } table[] = { - { "/dev/fd/", 8, specfdopen }, - { "/dev/stdin", 10, specfdopen }, -@@ -1570,12 +1576,7 @@ - - for (i = 0; i < devcount; i++) { - if (STREQN(name, table[i].name, table[i].compare)) { -- iop = & table[i].iob; -- -- if (iop->buf != NULL) { -- spec_setup(iop, 0, FALSE); -- return iop; -- } else if ((*table[i].fp)(iop, name, mode) == 0) -+ if ((iop = (*table[i].fp)(iop, name, mode)) != NULL) - return iop; - else { - warning(_("could not open `%s', mode `%s'"), -@@ -2480,9 +2481,12 @@ - { - struct stat sbuf; - struct open_hook *oh; -+ int iop_malloced = FALSE; - -- if (iop == NULL) -+ if (iop == NULL) { - emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc"); -+ iop_malloced = TRUE; -+ } - memset(iop, '\0', sizeof(IOBUF)); - iop->flag = 0; - iop->fd = fd; -@@ -2494,8 +2498,12 @@ - break; - } - -+ if (iop->fd == INTERNAL_HANDLE) -+ return iop; -+ - if (iop->fd == INVALID_HANDLE) { -- free(iop); -+ if (iop_malloced) -+ free(iop); - return NULL; - } - if (isatty(iop->fd)) -@@ -2503,7 +2511,7 @@ - iop->readsize = iop->size = optimal_bufsize(iop->fd, & sbuf); - iop->sbuf = sbuf; - if (do_lint && S_ISREG(sbuf.st_mode) && sbuf.st_size == 0) -- lintwarn(_("data file `%s' is empty"), name); -+ lintwarn(_("data file `%s' is empty"), name); - errno = 0; - iop->count = iop->scanoff = 0; - emalloc(iop->buf, char *, iop->size += 2, "iop_alloc"); -@@ -2906,6 +2914,10 @@ - - /* <fill initial buffer>= */ - if (has_no_data(iop) || no_data_left(iop)) { -+ if (is_internal(iop)) { -+ iop->flag |= IOP_AT_EOF; -+ return EOF; -+ } - iop->count = read(iop->fd, iop->buf, iop->readsize); - if (iop->count == 0) { - iop->flag |= IOP_AT_EOF; - -

1 0

ports/core (2.3): pciutils: explicit set mandir to avoid installation into /usr/share/man if exist, thx Giorgio Lando
by crux＠crux.nu 07 Oct '07

07 Oct '07

commit f12b231c30e48cbead9bb00cf33dc18ffd8a8552 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Oct 7 17:58:39 2007 +0200 pciutils: explicit set mandir to avoid installation into /usr/share/man if exist, thx Giorgio Lando diff --git a/pciutils/Pkgfile b/pciutils/Pkgfile index b906305..61e92e4 100644 --- a/pciutils/Pkgfile +++ b/pciutils/Pkgfile @@ -11,5 +11,5 @@ source=(http://www.kernel.org/pub/software/utils/$name/$name-$version.tar.g… build() { cd $name-$version make OPT="$CFLAGS" PREFIX=/usr ZLIB=no - make DESTDIR=$PKG PREFIX=/usr install install-lib + make DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man install install-lib }

1 0

ports/opt (2.3): unison: update to 2.27.47
by crux＠crux.nu 07 Oct '07

07 Oct '07

commit 24a71588058c4333d2df3bcd27cef6b8d57a2298 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Oct 7 10:03:12 2007 +0200 unison: update to 2.27.47 diff --git a/unison/.md5sum b/unison/.md5sum index 4a21e17..253acdf 100644 --- a/unison/.md5sum +++ b/unison/.md5sum @@ -1,2 +1,2 @@ -8c812bb3cd9c15657bd505eb24fd7b24 unison-2.27.29.tar.gz +5fd14559e8478087e630b7955c27a1c3 unison-2.27.47.tar.gz c3d6644df76adbf44c3c12eb4fc11587 unison.1 diff --git a/unison/Pkgfile b/unison/Pkgfile index 2fcf33f..c31d24d 100644 --- a/unison/Pkgfile +++ b/unison/Pkgfile @@ -5,7 +5,7 @@ # Depends on: ocaml name=unison -version=2.27.29 +version=2.27.47 release=1 source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$… \ $name.1)

1 0

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

07 Oct '07

commit 7053def2a223ad58f6b301ccbc52e51a0ff8da6f Merge: 56d2c58... d0347e0... Author: Juergen Daubert <jue(a)jue.li> Date: Sun Oct 7 09:52:14 2007 +0200 Merge branch '2.3' into 2.4

1 0

ports/core (2.4): gawk: update to 3.1.5h
by crux＠crux.nu 07 Oct '07

07 Oct '07

commit 1213e7b018ee830e07e4d169cf0ac7d08caaccd7 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Oct 7 09:48:30 2007 +0200 gawk: update to 3.1.5h diff --git a/gawk/.footprint b/gawk/.footprint index 03d4b0b..15f2a58 100644 --- a/gawk/.footprint +++ b/gawk/.footprint @@ -6,3 +6,24 @@ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ lrwxrwxrwx root/root usr/man/man1/awk.1.gz -> gawk.1.gz -rw-r--r-- root/root usr/man/man1/gawk.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/awk/ +-rw-r--r-- root/root usr/share/awk/assert.awk +-rw-r--r-- root/root usr/share/awk/bits2str.awk +-rw-r--r-- root/root usr/share/awk/cliff_rand.awk +-rw-r--r-- root/root usr/share/awk/ctime.awk +-rw-r--r-- root/root usr/share/awk/ftrans.awk +-rw-r--r-- root/root usr/share/awk/getopt.awk +-rw-r--r-- root/root usr/share/awk/gettime.awk +-rw-r--r-- root/root usr/share/awk/group.awk +-rw-r--r-- root/root usr/share/awk/join.awk +-rw-r--r-- root/root usr/share/awk/libintl.awk +-rw-r--r-- root/root usr/share/awk/nextfile.awk +-rw-r--r-- root/root usr/share/awk/noassign.awk +-rw-r--r-- root/root usr/share/awk/ord.awk +-rw-r--r-- root/root usr/share/awk/passwd.awk +-rw-r--r-- root/root usr/share/awk/readable.awk +-rw-r--r-- root/root usr/share/awk/rewind.awk +-rw-r--r-- root/root usr/share/awk/round.awk +-rw-r--r-- root/root usr/share/awk/strtonum.awk +-rw-r--r-- root/root usr/share/awk/zerofile.awk diff --git a/gawk/.md5sum b/gawk/.md5sum index 45cfe27..78edcaf 100644 --- a/gawk/.md5sum +++ b/gawk/.md5sum @@ -1,2 +1 @@ -ab4c93ca4e8c5a5e5053003a07822699 gawk-3.1.5-io.patch -4760325489479cac17fe0114b8f62f30 gawk-3.1.5.tar.gz +d2e1563d39c585bd5719ede950ef0c72 gawk-3.1.5h.tar.bz2 diff --git a/gawk/Pkgfile b/gawk/Pkgfile index ff3ea4a..7601390 100644 --- a/gawk/Pkgfile +++ b/gawk/Pkgfile @@ -3,22 +3,20 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=gawk -version=3.1.5 -release=3 -source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz \ - $name-$version-io.patch) +version=3.1.5h +release=1 +source=(http://www.skeeve.com/$name/$name-$version.tar.bz2) build() { cd $name-$version - - patch -p0 -i $SRC/$name-$version-io.patch ./configure --prefix=/usr \ + --mandir=/usr/man \ --enable-switch \ --disable-nls make make DESTDIR=$PKG install - rm -rf $PKG/usr/{info,share,libexec} + rm -r $PKG/usr/{share/info,libexec} rm $PKG/usr/bin/gawk-$version \ $PKG/usr/bin/pgawk-$version \ $PKG/usr/bin/{p,i}gawk \

1 0