[CVS] OpenPKG: OPENPKG_1_3_SOLID: openpkg-src/fsl/ fsl.patch fsl.spec ...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 28-Oct-2003 09:27:34 Branch: OPENPKG_1_3_SOLID HEAD Handle: 200309150930533715001 Modified files: openpkg-web news.txt Modified files: (Branch: OPENPKG_1_3_SOLID) openpkg-src/fsl fsl.spec Removed files:(Branch: OPENPKG_1_3_SOLID) openpkg-src/fsl fsl.patch Log: MFC: upgrade fsl 1.2.0 - 1.3.0 removing patch and gcc dependency Summary: RevisionChanges Path 1.2 +0 -24 openpkg-src/fsl/fsl.patch 1.31.2.6.2.3+3 -5 openpkg-src/fsl/fsl.spec 1.7198 +1 -0 openpkg-web/news.txt rm -f openpkg-src/fsl/fsl.patch '@@ .' Index: openpkg-src/fsl/fsl.patch [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 '@@ .' Index: openpkg-src/fsl/fsl.spec $ cvs diff -u -r1.31.2.6.2.2 -r1.31.2.6.2.3 fsl.spec --- openpkg-src/fsl/fsl.spec 15 Sep 2003 07:54:45 - 1.31.2.6.2.2 +++ openpkg-src/fsl/fsl.spec 28 Oct 2003 08:27:34 - 1.31.2.6.2.3 @@ -32,8 +32,8 @@ Distribution: OpenPKG [CORE] Group:System License: MIT-style -Version: 1.2.0 -Release: 1.3.1 +Version: 1.3.0 +Release: 1.3.2 # package options %option with_fsl_debuglogcode no @@ -42,12 +42,11 @@ Source0: ftp://ftp.ossp.org/pkg/lib/fsl/fsl-%{version}.tar.gz Source1: rc.fsl Source2: fsl.fsl -Patch0: fsl.patch # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg = 1.3.0, gcc +BuildPreReq: OpenPKG, openpkg = 1.3.0 PreReq: OpenPKG, openpkg = 1.3.0 AutoReq: no AutoReqProv: no @@ -64,7 +63,6 @@ %prep %setup -q -%patch -p0 %{l_shtool} subst \ -e 's;pcre;fsl_pcre;g' \ -e '/#include/s;fsl_pcre;pcre;g' \ @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7197 -r1.7198 news.txt --- openpkg-web/news.txt 28 Oct 2003 06:08:05 - 1.7197 +++ openpkg-web/news.txt 28 Oct 2003 08:27:33 - 1.7198 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Pfsl-1.3.0-1.3.2 28-Oct-2003: Upgraded package: Popenpkg-20031028-20031028 27-Oct-2003: Upgraded package: Pdbtool-1.6-20031027 27-Oct-2003: Upgraded package: Pcvs-1.12.2-20031027 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[OpenPKG #268] postfix package
Request 268 was acted upon. _ URL: https://rt.openpkg.org/id/268 Ticket: [OpenPKG #268] Subject: postfix package Requestors: [EMAIL PROTECTED] Queue: openpkg Owner: thl Status: open Transaction: Correspondence added by thl Time: Tue Oct 28 09:41:53 2003 [thl - Fri Oct 17 23:56:13 2003]: My suggestion: For OpenPKG v1.3 i vote to MFC the postfix changes from http://cvs.openpkg.org/chngview?cn=12849 into a UPD package. The fsl v1.3 was written to be compatible to fsl v1.2 to allow exactly this. fsl-1.3.0-1.3.2 now available, see http://cvs.openpkg.org/chngview?cn=13046 -- Thomas Lotterer OpenPKG Developer [EMAIL PROTECTED] __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[OpenPKG #268] postfix package
Request 268 was acted upon. This is an automatically generated message. URL: https://rt.openpkg.org/id/268 Ticket: [OpenPKG #268] Subject: postfix package Requestors: [EMAIL PROTECTED] Queue: openpkg Owner: thl Status: resolved Transaction: Status changed from open to resolved by thl Time: Tue Oct 28 09:41:55 2003 _ According to our records, your request has been resolved. If you have any further questions or concerns, please just respond to this message. __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: describe optional files in a rpm package
On Tue, Oct 28, 2003, Matthias Kurz wrote: I still have one ;) Is there a way to describe optional files in an rpm package ? I mean to specify attributes (%config, owner, group, permissions) for a file that is not included in a package, but could be created by the user or so. I think i have read something in this direction some time ago (something about ghost files or shadow files or so), but i cannot find it again. Yes, there exists a %ghost attribute. But is a little bit strange. We have to ask Thomas what the problems with it are... Thomas? Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY platform rpmtool
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Oct-2003 10:37:34 Branch: HEAD Handle: 2003102809373400 Modified files: openpkg-src/openpkg HISTORY platform rpmtool Log: upgrade to latest OSSP platform script for Darwin 6.6 and Solaris 10 support; read from /dev/null on 'as --version' to circumvent brain-dead GNU as 1.x on OpenDarwin Summary: RevisionChanges Path 1.81+1 -0 openpkg-src/openpkg/HISTORY 1.11+36 -11 openpkg-src/openpkg/platform 1.24+1 -1 openpkg-src/openpkg/rpmtool patch -p0 '@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.80 -r1.81 HISTORY --- openpkg-src/openpkg/HISTORY 27 Oct 2003 20:18:44 - 1.80 +++ openpkg-src/openpkg/HISTORY 28 Oct 2003 09:37:34 - 1.81 @@ -2,6 +2,7 @@ 2003 +20031028 upgrade to latest OSSP platform script for Darwin 6.6 and Solaris 10 support 20031027 port RPM to OpenDarwin 6.6.2 20031027 try to cleanup glob(3) replacement hacks in RPM 20031021 fix RPM GCC building on Unixware by using Linux i386 assembly specific stuff on Linux only. @@ . patch -p0 '@@ .' Index: openpkg-src/openpkg/platform $ cvs diff -u -r1.10 -r1.11 platform --- openpkg-src/openpkg/platform 29 Sep 2003 13:04:17 - 1.10 +++ openpkg-src/openpkg/platform 28 Oct 2003 09:37:34 - 1.11 @@ -231,7 +231,7 @@ ;; web ) # non-whitespace HTTP Server-header id -opt_F=%ap-%sp +opt_F=%sp-%ap opt_S=/ opt_C=+ ;; @@ -383,6 +383,9 @@ *:Linux:* ) # determine architecture AT=${UNAME_MACHINE} +case ${AT} in + x86_64 ) AT='AMD64' ;; +esac AP=${AT} case ${AP} in i[3-6]86 ) AP='iX86' ;; @@ -409,7 +412,7 @@ [ .${tagfile} = .x ] continue [ ! -f /etc/${tagfile} ] continue n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e 's/[_-]version$//'` -v=`cat /etc/${tagfile} | grep '[0-9]' | head -1 |\ +v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep '[0-9]' | head -1 |\ sed -e 's/^/#/' \ -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \ -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \ @@ -439,7 +442,7 @@ # determine architecture AT=${UNAME_MACHINE} case ${AT} in -i86pc ) AT=iX86 ;; +i86pc ) AT=iX86 ;; esac AP=${AT} case ${AP} in @@ -455,7 +458,7 @@ ST=[Sun ]SunOS ${UNAME_RELEASE} v=`echo ${UNAME_RELEASE} |\ sed -e 's;^4\.;1.;' \ - -e 's;^5\.\([0-6]\).*;2.\1;' \ + -e 's;^5\.\([0-6]\)[^0-9]*$;2.\1;' \ -e 's;^5\.\([0-9][0-9]*\).*;\1;'` SP=[Sun ]Solaris $v case ${UNAME_RELEASE} in @@ -469,7 +472,7 @@ # determine architecture AT=${UNAME_MACHINE} case ${AT} in -i[3-6]86 | ix86at ) AT=iX86 ;; +i[3-6]86 | ix86at ) AT=iX86 ;; esac AP=${AT} # determine system @@ -484,7 +487,7 @@ # determine architecture AT=${UNAME_MACHINE} case ${AT} in -x86pc ) AT=iX86 ;; +x86pc ) AT=iX86 ;; esac AP=${AT} # determine system @@ -501,8 +504,8 @@ AT=${UNAME_MACHINE} AP=${AT} case ${AP}:${UNAME_SYSTEM} in -IP*:IRIX64 ) AP=MIPS64 ;; -IP*:* ) AP=MIPS ;; +IP*:IRIX64 ) AP=MIPS64 ;; +IP*:* ) AP=MIPS ;; esac AC=${AP} # determine system @@ -520,7 +523,7 @@ case ${AT} in ia64 ) AT=IA64 ;; 9000/[34]?? ) AT=M68K ;; -9000/[678][0-9][0-9]) +9000/[678][0-9][0-9]) sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2/dev/null` case ${sc_cpu_version} in @@ -581,6 +584,22 @@ esac
[CVS] OpenPKG: openpkg-src/postfix/ postfix.patch postfix.spec openpkg...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 28-Oct-2003 11:42:16 Branch: HEAD Handle: 2003102810421402 Modified files: openpkg-src/postfix postfix.patch postfix.spec openpkg-web news.txt Log: PR#285 patch to use soft not hard limits with setrlimit(2) Summary: RevisionChanges Path 1.3 +82 -0 openpkg-src/postfix/postfix.patch 1.179 +4 -1 openpkg-src/postfix/postfix.spec 1.7199 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-src/postfix/postfix.patch $ cvs diff -u -r1.2 -r1.3 postfix.patch --- openpkg-src/postfix/postfix.patch 22 Jul 2003 14:19:09 - 1.2 +++ openpkg-src/postfix/postfix.patch 28 Oct 2003 10:42:16 - 1.3 @@ -23,3 +23,85 @@ #endif } if (msg_verbose) + +https://rt.openpkg.org/Ticket/Display.html?id=285 +USE_SOFTLIMITONLY kludge + +Index: src/util/file_limit.c +--- src/util/file_limit.c.orig 2000-08-22 23:44:44.0 +0200 src/util/file_limit.c2003-10-28 11:11:47.0 +0100 +@@ -80,12 +80,21 @@ + voidset_file_limit(off_t limit) + { + #ifdef USE_ULIMIT ++#ifdef USE_SOFTLIMITONLY ++#error USE_ULIMIT and USE_SOFTLIMITONLY are mutual exclusive ++#endif + if (ulimit(UL_SETFSIZE, limit / ULIMIT_BLOCK_SIZE) 0) + msg_fatal(ulimit: %m); + #else + struct rlimit rlim; + ++#ifdef USE_SOFTLIMITONLY ++if (getrlimit(RLIMIT_FSIZE, rlim) 0) ++rlim.rlim_max = RLIM_INFINITY; ++rlim.rlim_cur = limit; ++#else + rlim.rlim_cur = rlim.rlim_max = limit; ++#endif + if (setrlimit(RLIMIT_FSIZE, rlim) 0) + msg_fatal(setrlimit: %m); + #ifdef SIGXFSZ + +Index: src/util/msg_syslog.c +--- src/util/msg_syslog.c.orig 2003-09-14 03:34:33.0 +0200 src/util/msg_syslog.c2003-10-28 11:14:00.0 +0100 +@@ -50,6 +50,11 @@ + #include syslog.h + #include string.h + #include time.h ++#ifdef USE_SOFTLIMITONLY ++#include sys/time.h ++#include sys/resource.h ++#include signal.h ++#endif + + /* Application-specific. */ + +@@ -144,6 +149,9 @@ + + static void msg_syslog_print(int level, const char *text) + { ++#ifdef USE_SOFTLIMITONLY ++struct rlimit save, rlim; ++#endif + static int log_level[] = { + LOG_INFO, LOG_WARNING, LOG_ERR, LOG_CRIT, LOG_CRIT, + }; +@@ -154,6 +162,15 @@ + if (level 0 || level = (int) (sizeof(log_level) / sizeof(log_level[0]))) + msg_panic(msg_syslog_print: invalid severity level: %d, level); + ++#ifdef USE_SOFTLIMITONLY ++if (getrlimit(RLIMIT_FSIZE, save) 0) { ++save.rlim_cur = RLIM_INFINITY; ++save.rlim_max = RLIM_INFINITY; ++} ++rlim.rlim_cur = save.rlim_max; ++rlim.rlim_max = save.rlim_max; ++(void)setrlimit(RLIMIT_FSIZE, rlim); ++#endif + if (level == MSG_INFO) { + syslog(syslog_facility | log_level[level], %.*s, +(int) MSG_SYSLOG_RECLEN, text); +@@ -161,6 +178,9 @@ + syslog(syslog_facility | log_level[level], %s: %.*s, +severity_name[level], (int) MSG_SYSLOG_RECLEN, text); + } ++#ifdef USE_SOFTLIMITONLY ++(void)setrlimit(RLIMIT_FSIZE, save); ++#endif + } + + /* msg_syslog_init - initialize */ + @@ . patch -p0 '@@ .' Index: openpkg-src/postfix/postfix.spec $ cvs diff -u -r1.178 -r1.179 postfix.spec --- openpkg-src/postfix/postfix.spec 17 Oct 2003 21:41:35 - 1.178 +++ openpkg-src/postfix/postfix.spec 28 Oct 2003 10:42:16 - 1.179 @@ -39,7 +39,7 @@ Group:Mail License: IPL Version: %{V_postfix} -Release: 20031017 +Release: 20031028 # package options %option with_fsl yes @@ -182,7 +182,10 @@ CCARGS=$CCARGS -DHAS_LDAP AUXLIBS=$AUXLIBS -lldap -llber -lssl -lcrypto %endif +%if %{with_fsl} == yes AUXLIBS=$AUXLIBS %{l_fsl_ldflags} %{l_fsl_libs} +CCARGS=$CCARGS -DUSE_SOFTLIMITONLY +%endif %if %{with_fdsetsize} != no %if %{with_fdsetsize} == yes CCARGS=$CCARGS -DFD_SETSIZE=1024 @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7198 -r1.7199 news.txt --- openpkg-web/news.txt 28 Oct 2003 08:27:33 - 1.7198
[OpenPKG #285] postfix/ulimit vs. fsl/file channel
Request 285 was acted upon. _ URL: https://rt.openpkg.org/id/285 Ticket: [OpenPKG #285] Subject: postfix/ulimit vs. fsl/file channel Requestors: [EMAIL PROTECTED] Queue: openpkg Owner: thl Status: open Transaction: Correspondence added by thl Time: Tue Oct 28 11:45:36 2003 It is clear that under the circumstances described herein no code that is executed after a hard limit was set will ever be able to write a file larger than the limit. Even if the code would know about ulimit(2) it cannot revert the limit unless it runs as root. This affects all code that tries to write to a file and fsl is only one victim. The situation is a dead end for the current fsl-1.x implementation and is not likely to change soon. For OpenPKG this means we need to try to tweak the affected postfix package to overcome this limitation. Further investigation showed that postfix uses either of ulimit(2) or setrlimit(2). All information I found told me that ulimit(2) unconditionally and irreversibly sets both hard and soft limits. It is assumed that Wietse opted to set both limits via setrlimit(2) to get the same behavior as with ulimit(2). All platforms supported by OpenPKG support and use setrlimit(2) which could set hard and soft limits separately. So I created a patch that only sets the soft limit and for every syslog(2) call it saves the current limits, expands soft limit to the max (hard) and after the call it reverts to the saved limits. Any failures to tweak the limits are ignored so in the worst case fallback behavior is identical to current behavior. The patch is only applied if postfix is build with_fsl. Please go ahead try the patched postfix [1] in the field with_fsl and report any problems you encounter. Depending on feedback I'll go and integrate both this patch and fsl-1.3.0 monitor feature into a 1.3 UPD package . [1] ftp://ftp.openpkg.org/current/SRC/postfix-2.0.16-20031028.src.rpm -- Thomas Lotterer OpenPKG Developer [EMAIL PROTECTED] __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.apache openpkg-src/apache/ apache...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web openpkg$ Date: 28-Oct-2003 11:47:24 Branch: HEAD Handle: 2003102810472202 Modified files: openpkg-re/vcheck vc.apache openpkg-src/apache apache.patch apache.spec openpkg-web news.txt Log: upgrading package: apache 1.3.28 - 1.3.29 Summary: RevisionChanges Path 1.39+1 -1 openpkg-re/vcheck/vc.apache 1.9 +6 -27 openpkg-src/apache/apache.patch 1.176 +2 -2 openpkg-src/apache/apache.spec 1.7200 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-re/vcheck/vc.apache $ cvs diff -u -r1.38 -r1.39 vc.apache --- openpkg-re/vcheck/vc.apache 8 Oct 2003 07:16:58 - 1.38 +++ openpkg-re/vcheck/vc.apache 28 Oct 2003 10:47:22 - 1.39 @@ -2,7 +2,7 @@ } prog apache = { - version = 1.3.28 + version = 1.3.29 url = http://www.apache.org/dist/httpd/ regex = apache_(__VER__)\.tar\.gz } @@ . patch -p0 '@@ .' Index: openpkg-src/apache/apache.patch $ cvs diff -u -r1.8 -r1.9 apache.patch --- openpkg-src/apache/apache.patch 29 Jul 2003 14:17:17 - 1.8 +++ openpkg-src/apache/apache.patch 28 Oct 2003 10:47:24 - 1.9 @@ -1,5 +1,5 @@ apache_1.3.28/configure.orig Tue May 21 14:24:59 2002 -+++ apache_1.3.28/configure Mon Feb 10 11:08:40 2003 +--- apache_1.3.29/configure.orig Tue May 21 14:24:59 2002 apache_1.3.29/configure Mon Feb 10 11:08:40 2003 @@ -1216,10 +1216,10 @@ ## or we cannot support the case where the relative ## path is just the emtpy one, i.e. ] @@ -15,8 +15,8 @@ ## ## check and debug apache_1.3.28/src/Configure.dist 2003-06-11 11:59:51.0 +0200 -+++ apache_1.3.28/src/Configure 2003-06-11 12:46:14.0 +0200 +--- apache_1.3.29/src/Configure.dist 2003-06-11 11:59:51.0 +0200 apache_1.3.29/src/Configure 2003-06-11 12:46:14.0 +0200 @@ -1190,14 +1190,20 @@ SHLIB_SUFFIX_DEPTH=0 ;; @@ -44,29 +44,8 @@ SHLIB_SUFFIX_DEPTH=1 ;; *-sunos4*) apache_1.3.28/src/main/alloc.c.dist 2003-07-29 15:23:08.0 +0200 -+++ apache_1.3.28/src/main/alloc.c 2003-07-29 15:25:08.0 +0200 -@@ -2858,13 +2858,11 @@ - for (p = procs; p; p = p-next) { - if ((p-kill_how == kill_after_timeout) - || (p-kill_how == kill_only_once)) { --/* Subprocess may be dead already. Only need the timeout if not. */ --if (ap_os_kill(p-pid, SIGTERM) == -1) { --p-kill_how = kill_never; --} --else { --need_timeout = 1; --} -+/* Dead subprocesses still need a waitpid to remove the zombie -+ * so we have to ignore errors returned by ap_os_kill() -+ */ -+ap_os_kill(p-pid, SIGTERM); -+need_timeout = 1; - } - else if (p-kill_how == kill_always) { - kill(p-pid, SIGKILL); apache_1.3.28/src/main/util_script.c.origMon Jul 28 17:13:56 2003 -+++ apache_1.3.28/src/main/util_script.c Tue Jul 29 15:55:27 2003 +--- apache_1.3.29/src/main/util_script.c.origMon Jul 28 17:13:56 2003 apache_1.3.29/src/main/util_script.c Tue Jul 29 15:55:27 2003 @@ -246,6 +246,7 @@ } } @@ . patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.175 -r1.176 apache.spec --- openpkg-src/apache/apache.spec9 Oct 2003 08:31:23 - 1.175 +++ openpkg-src/apache/apache.spec28 Oct 2003 10:47:24 - 1.176 @@ -33,7 +33,7 @@ ## go with the macro mechanism. But do not try to repeat this! # package component versions -%define V_apache 1.3.28 +%define V_apache 1.3.29 %define V_mod_ssl2.8.15-1.3.28 %define V_mod_perl 1.29 %define V_mod_php4.3.3 @@ -60,7 +60,7 @@ Group:Web License: ASF Version: %{V_apache} -Release: 20031009 +Release: 20031028 # package options (suexec related) %option with_suexec yes @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt
[CVS] OpenPKG: openpkg-re/vcheck/ vc.apache2 openpkg-src/apache2/ apac...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web openpkg$ Date: 28-Oct-2003 12:07:30 Branch: HEAD Handle: 2003102811072702 Modified files: openpkg-re/vcheck vc.apache2 openpkg-src/apache2 apache2.spec openpkg-web news.txt Log: upgrading package: apache2 2.0.47 - 2.0.48 Summary: RevisionChanges Path 1.9 +1 -1 openpkg-re/vcheck/vc.apache2 1.32+2 -2 openpkg-src/apache2/apache2.spec 1.7201 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-re/vcheck/vc.apache2 $ cvs diff -u -r1.8 -r1.9 vc.apache2 --- openpkg-re/vcheck/vc.apache2 9 Jul 2003 07:16:33 - 1.8 +++ openpkg-re/vcheck/vc.apache2 28 Oct 2003 11:07:27 - 1.9 @@ -2,7 +2,7 @@ } prog apache2 = { - version = 2.0.47 + version = 2.0.48 url = http://www.apache.org/dist/httpd/ regex = httpd-(__VER__)\.tar\.gz } @@ . patch -p0 '@@ .' Index: openpkg-src/apache2/apache2.spec $ cvs diff -u -r1.31 -r1.32 apache2.spec --- openpkg-src/apache2/apache2.spec 14 Oct 2003 16:15:42 - 1.31 +++ openpkg-src/apache2/apache2.spec 28 Oct 2003 11:07:29 - 1.32 @@ -32,8 +32,8 @@ Distribution: OpenPKG [EVAL] Group:Web License: ASF -Version: 2.0.47 -Release: 20031014 +Version: 2.0.48 +Release: 20031028 # list of sources Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7200 -r1.7201 news.txt --- openpkg-web/news.txt 28 Oct 2003 10:47:22 - 1.7200 +++ openpkg-web/news.txt 28 Oct 2003 11:07:28 - 1.7201 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Papache2-2.0.48-20031028 28-Oct-2003: Upgraded package: Papache-1.3.29-20031028 28-Oct-2003: Upgraded package: Ppostfix-2.0.16-20031028 28-Oct-2003: Upgraded package: Pfsl-1.3.0-1.3.2 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: OPENPKG_1_3_SOLID: openpkg-src/apache/ apache.patch apa...
*/ +@@ -2442,7 +2441,7 @@ + bri = briRC; + } + /* see ap_pregsub() in src/main/util.c */ +-if (bri n = bri-nsub ++if (bri n AP_MAX_REG_MATCH + bri-regmatch[n].rm_eo bri-regmatch[n].rm_so) { + span = bri-regmatch[n].rm_eo - bri-regmatch[n].rm_so; + if (span space) { +Index: apache_1.3.28/src/modules/standard/mod_rewrite.h +--- apache_1.3.28/src/modules/standard/mod_rewrite.h.orig2003-05-19 04:35:31.0 +0200 apache_1.3.28/src/modules/standard/mod_rewrite.h 2003-10-28 14:10:48.0 +0100 +@@ -253,8 +253,6 @@ + + #define MAX_ENV_FLAGS 15 + +-#define MAX_NMATCH10 +- + /* default maximum number of internal redirects */ + #define REWRITE_REDIRECT_LIMIT 10 + +@@ -368,7 +366,7 @@ + typedef struct backrefinfo { + char *source; + int nsub; +-regmatch_t regmatch[10]; ++regmatch_t regmatch[AP_MAX_REG_MATCH]; + } backrefinfo; + + @@ . patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.106.2.6.2.1 -r1.106.2.6.2.2 apache.spec --- openpkg-src/apache/apache.spec29 Jul 2003 14:58:13 - 1.106.2.6.2.1 +++ openpkg-src/apache/apache.spec28 Oct 2003 14:26:43 - 1.106.2.6.2.2 @@ -60,7 +60,7 @@ Group:Web License: ASF Version: %{V_apache} -Release: 1.3.0 +Release: 1.3.1 # package options (suexec related) %option with_suexec yes @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7201 -r1.7202 news.txt --- openpkg-web/news.txt 28 Oct 2003 11:07:28 - 1.7201 +++ openpkg-web/news.txt 28 Oct 2003 14:26:41 - 1.7202 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Papache-1.3.28-1.3.1 28-Oct-2003: Upgraded package: Papache2-2.0.48-20031028 28-Oct-2003: Upgraded package: Papache-1.3.29-20031028 28-Oct-2003: Upgraded package: Ppostfix-2.0.16-20031028 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: OPENPKG_1_2_SOLID: openpkg-src/apache/ apache.patch apa...
AP_MAX_REG_MATCH + bri-regmatch[n].rm_eo bri-regmatch[n].rm_so) { + span = bri-regmatch[n].rm_eo - bri-regmatch[n].rm_so; + if (span space) { +Index: apache_1.3.27/src/modules/standard/mod_rewrite.h +--- apache_1.3.27/src/modules/standard/mod_rewrite.h.orig2002-03-13 22:05:34.0 +0100 apache_1.3.27/src/modules/standard/mod_rewrite.h 2003-10-28 15:20:13.0 +0100 +@@ -253,8 +253,6 @@ + + #define MAX_ENV_FLAGS 15 + +-#define MAX_NMATCH10 +- + /* + ** + ** our private data structures we handle with +@@ -356,7 +354,7 @@ + typedef struct backrefinfo { + char *source; + int nsub; +-regmatch_t regmatch[10]; ++regmatch_t regmatch[AP_MAX_REG_MATCH]; + } backrefinfo; + + @@ . patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.106.2.1.2.3 -r1.106.2.1.2.4 apache.spec --- openpkg-src/apache/apache.spec18 Mar 2003 15:08:11 - 1.106.2.1.2.3 +++ openpkg-src/apache/apache.spec28 Oct 2003 14:30:57 - 1.106.2.1.2.4 @@ -60,7 +60,7 @@ Group:Web License: ASF Version: %{V_apache} -Release: 1.2.2 +Release: 1.2.3 # package options (additionally used Apache modules; can be enabled without thinking) %option with_mod_sslno @@ -168,6 +168,7 @@ Source23: rc.apache Patch0: http://www.php.net/distributions/php-4.3.0-to-4.3.1.patch.gz Patch1: mod_ssl.patch +Patch2: apache.patch # build information Prefix: %{l_prefix} @@ -277,6 +278,7 @@ %prep # unpack Apache distribution %setup0 -q -c +%patch2 -p0 # unpack optional extension modules %if %{with_mod_ssl} == yes @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7202 -r1.7203 news.txt --- openpkg-web/news.txt 28 Oct 2003 14:26:41 - 1.7202 +++ openpkg-web/news.txt 28 Oct 2003 14:30:54 - 1.7203 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Papache-1.3.27-1.2.3 28-Oct-2003: Upgraded package: Papache-1.3.28-1.3.1 28-Oct-2003: Upgraded package: Papache2-2.0.48-20031028 28-Oct-2003: Upgraded package: Papache-1.3.29-20031028 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-web/ security.txt security.wml openpkg-web/secu...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-web Date: 28-Oct-2003 15:46:56 Branch: HEAD Handle: 2003102814465600 Added files: openpkg-web/securityOpenPKG-SA-2003.046-apache.txt Modified files: openpkg-web security.txt security.wml openpkg-web/securitypage.pl Log: SA-2003.046-apache; CAN-2003-0542 Summary: RevisionChanges Path 1.53+1 -0 openpkg-web/security.txt 1.71+1 -0 openpkg-web/security.wml 1.1 +71 -0 openpkg-web/security/OpenPKG-SA-2003.046-apache.txt 1.30+1 -1 openpkg-web/security/page.pl patch -p0 '@@ .' Index: openpkg-web/security.txt $ cvs diff -u -r1.52 -r1.53 security.txt --- openpkg-web/security.txt 19 Oct 2003 07:16:29 - 1.52 +++ openpkg-web/security.txt 28 Oct 2003 14:46:56 - 1.53 @@ -1,3 +1,4 @@ +28-Oct-2003: Security Advisory: SOpenPKG-SA-2003.046-apache 19-Oct-2003: Security Advisory: SOpenPKG-SA-2003.045-ircd 30-Sep-2003: Security Advisory: SOpenPKG-SA-2003.044-openssl 24-Sep-2003: Security Advisory: SOpenPKG-SA-2003.043-proftpd @@ . patch -p0 '@@ .' Index: openpkg-web/security.wml $ cvs diff -u -r1.70 -r1.71 security.wml --- openpkg-web/security.wml 19 Oct 2003 07:16:29 - 1.70 +++ openpkg-web/security.wml 28 Oct 2003 14:46:56 - 1.71 @@ -76,6 +76,7 @@ /define-tag box bdwidth=1 bdcolor=#a5a095 bdspace=10 bgcolor=#e5e0d5 table cellspacing=0 cellpadding=0 border=0 + sa 2003.046 apache sa 2003.045 ircd sa 2003.044 openssl sa 2003.043 proftpd @@ . patch -p0 '@@ .' Index: openpkg-web/security/OpenPKG-SA-2003.046-apache.txt $ cvs diff -u -r0 -r1.1 OpenPKG-SA-2003.046-apache.txt --- /dev/null 2003-10-28 15:46:56.0 +0100 +++ OpenPKG-SA-2003.046-apache.txt2003-10-28 15:46:56.0 +0100 @@ -0,0 +1,71 @@ + + +OpenPKG Security AdvisoryThe OpenPKG Project +http://www.openpkg.org/security.html http://www.openpkg.org [EMAIL PROTECTED] [EMAIL PROTECTED] +OpenPKG-SA-2003.046 29-Oct-2003 + + +Package: apache +Vulnerability: local regex backreference overflow +OpenPKG Specific:no + +Affected Releases: Affected Packages: Corrected Packages: +OpenPKG CURRENT = apache-1.3.28-20031009 = apache-1.3.29-20031028 +OpenPKG 1.3 = apache-1.3.28-1.3.0 = apache-1.3.28-1.3.1 +OpenPKG 1.2 = apache-1.3.27-1.2.2 = apache-1.3.27-1.2.3 + +Dependent Packages: none + +Description: + Andre Malo fixed problems [0] in the mod_alias and mod_rewrite + modules of the Apache [1] webserver. Buffer overflows occurred if a + regular expression with more than 9 captures were configured. The + Common Vulnerabilities and Exposures (CVE) project assigned the id + CAN-2003-0542 [2] to the problem. + + Please check whether you are affected by running prefix/bin/rpm -q + apache. If you have the apache package installed and its version + is affected (see above), we recommend that you immediately upgrade it + (see Solution). [3][4] + +Solution: + Select the updated source RPM appropriate for your OpenPKG release + [5][6], fetch it from the OpenPKG FTP service [7][8] or a mirror + location, verify its integrity [9], build a corresponding binary RPM + from it [3] and update your OpenPKG installation by applying the + binary RPM [4]. For the current release OpenPKG 1.3, perform the + following operations to permanently fix the security problem (for + other releases adjust accordingly). + + $ ftp ftp.openpkg.org + ftp bin + ftp cd release/1.3/UPD + ftp get apache-1.3.28-1.3.1.src.rpm + ftp bye + $ prefix/bin/rpm -v --checksig apache-1.3.28-1.3.1.src.rpm + $ prefix/bin/rpm --rebuild apache-1.3.28-1.3.1.src.rpm + $ su - + # prefix/bin/rpm -Fvh prefix/RPM/PKG/apache-1.3.28-1.3.1.*.rpm + + +References: + [0] http://marc.theaimsgroup.com/?l=apache-cvsm=106701190026083 + [1] http
[CVS] OpenPKG: openpkg-src/skey/ skey.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 28-Oct-2003 16:27:10 Branch: HEAD Handle: 2003102815270801 Modified files: openpkg-src/skeyskey.spec openpkg-web news.txt Log: do not install private headers Summary: RevisionChanges Path 1.25+3 -1 openpkg-src/skey/skey.spec 1.7204 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-src/skey/skey.spec $ cvs diff -u -r1.24 -r1.25 skey.spec --- openpkg-src/skey/skey.spec1 Aug 2003 09:17:45 - 1.24 +++ openpkg-src/skey/skey.spec28 Oct 2003 15:27:09 - 1.25 @@ -33,7 +33,7 @@ Group:Cryptography License: BSD Version: 1.1.5 -Release: 20030801 +Release: 20031028 # list of sources Source0: http://www.sparc.spb.su/Skey/skey-%{version}.tar.bz2 @@ -77,6 +77,8 @@ mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/skeyprune.1 \ $RPM_BUILD_ROOT%{l_prefix}/man/man1/skeyprune.1 rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man8 +rm -f $RPM_BUILD_ROOT%{l_prefix}/include/sha1.h +rm -f $RPM_BUILD_ROOT%{l_prefix}/include/rmd160.h %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7203 -r1.7204 news.txt --- openpkg-web/news.txt 28 Oct 2003 14:30:54 - 1.7203 +++ openpkg-web/news.txt 28 Oct 2003 15:27:08 - 1.7204 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Pskey-1.1.5-20031028 28-Oct-2003: Upgraded package: Papache-1.3.27-1.2.3 28-Oct-2003: Upgraded package: Papache-1.3.28-1.3.1 28-Oct-2003: Upgraded package: Papache2-2.0.48-20031028 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY rpm.patch.bugfix rpm.patch...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Oct-2003 16:59:21 Branch: HEAD Handle: 2003102815592000 Modified files: openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature rpm.patch.porting rpm.patch.regen Log: remove problematic INCPATH stuff in RPM configure which picks up external stuff Summary: RevisionChanges Path 1.82+1 -0 openpkg-src/openpkg/HISTORY 1.35+13 -15 openpkg-src/openpkg/rpm.patch.bugfix 1.36+84 -4 openpkg-src/openpkg/rpm.patch.feature 1.44+4 -20 openpkg-src/openpkg/rpm.patch.porting 1.34+303 -119 openpkg-src/openpkg/rpm.patch.regen patch -p0 '@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.81 -r1.82 HISTORY --- openpkg-src/openpkg/HISTORY 28 Oct 2003 09:37:34 - 1.81 +++ openpkg-src/openpkg/HISTORY 28 Oct 2003 15:59:20 - 1.82 @@ -2,6 +2,7 @@ 2003 +20031028 remove problematic INCPATH stuff in RPM configure which picks up external stuff 20031028 upgrade to latest OSSP platform script for Darwin 6.6 and Solaris 10 support 20031027 port RPM to OpenDarwin 6.6.2 20031027 try to cleanup glob(3) replacement hacks in RPM @@ . patch -p0 '@@ .' Index: openpkg-src/openpkg/rpm.patch.bugfix $ cvs diff -u -r1.34 -r1.35 rpm.patch.bugfix --- openpkg-src/openpkg/rpm.patch.bugfix 27 Oct 2003 15:32:30 - 1.34 +++ openpkg-src/openpkg/rpm.patch.bugfix 28 Oct 2003 15:59:20 - 1.35 @@ -10,7 +10,7 @@ ## 'patch' tool to upgrade those files. Each patch snippet is annotated ## with a short description. ## -## Created on: 27-Oct-2003 +## Created on: 28-Oct-2003 ## ## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG ## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE. @@ -43,22 +43,20 @@ } +--- -| Fix INCPATH checks by replacing an incorrect (because unescaped) -| [...] construct with the usual m4 workaround using an explicit -| test construct. +| Do not pick of the vendor BeeCrypt package on RedHat Linux. +--- Index: configure.ac --- configure.ac 2 Jul 2003 19:20:52 - 1.1.1.4 -+++ configure.ac 19 Oct 2003 19:08:19 - -@@ -348,7 +349,7 @@ - - AC_MSG_CHECKING(for $dir/include in INCPATH) - if test -d $dir/include 2/dev/null ; then --if [ $dir != /usr/local ] ; then -+if test $dir != /usr/local; then - INCPATH=$INCPATH -I$dir/include - fi - AC_MSG_RESULT(yes) configure.ac 28 Oct 2003 15:31:33 - +@@ -416,7 +417,7 @@ + AC_CHECK_HEADER([beecrypt/beecrypt.h], [ + AC_CHECK_LIB(beecrypt, mpfprintln, [ + AC_DEFINE(HAVE_LIBBEECRYPT, 1, [Define to 1 if you have the `beecrypt' library (-lbeecrypt).]) +-WITH_BEECRYPT_INCLUDE=-I/usr/include/beecrypt ++WITH_BEECRYPT_INCLUDE= + WITH_BEECRYPT_LIB=-lbeecrypt + ]) + ], [ +--- | Remove access to not-existing beecrypt/ subdirectory @@ -66,7 +64,7 @@ +--- Index: configure.ac --- configure.ac 2 Jul 2003 19:20:52 - 1.1.1.4 -+++ configure.ac 19 Oct 2003 19:08:19 - configure.ac 28 Oct 2003 15:31:33 - @@ -1274,7 +1302,6 @@ python/rpmdb/Makefile python/test/Makefile @@ . patch -p0 '@@ .' Index: openpkg-src/openpkg/rpm.patch.feature $ cvs diff -u -r1.35 -r1.36 rpm.patch.feature --- openpkg-src/openpkg/rpm.patch.feature 27 Oct 2003 20:18:45 - 1.35 +++ openpkg-src/openpkg/rpm.patch.feature 28 Oct 2003 15:59:20 - 1.36 @@ -10,7 +10,7 @@ ## 'patch' tool to upgrade those files. Each patch snippet is annotated ## with a short description. ## -## Created on: 27-Oct-2003 +## Created on: 28-Oct-2003 ## ## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG ## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 28-Oct-2003 17:14:00 Branch: HEAD Handle: 2003102816135703 Modified files: openpkg-src/apache apache.spec openpkg-web news.txt Log: added PHP multi-byte regex/string support Summary: RevisionChanges Path 1.177 +8 -0 openpkg-src/apache/apache.spec 1.7205 +0 -26 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-src/apache/apache.spec $ cvs diff -u -r1.176 -r1.177 apache.spec --- openpkg-src/apache/apache.spec28 Oct 2003 10:47:24 - 1.176 +++ openpkg-src/apache/apache.spec28 Oct 2003 16:14:00 - 1.177 @@ -119,6 +119,8 @@ %option with_mod_php_versioning no %option with_mod_php_snmp no %option with_mod_php_unixodbc no +%option with_mod_php_mbregex no +%option with_mod_php_mbstring no # package options (optional PHP3 specific settings; requires with_mod_php3) %option with_mod_php3_ftp no @@ -534,6 +536,12 @@ --prefix=%{l_prefix} \ --with-apache=../apache_%{V_apache} \ --with-config-file-path=%{l_prefix}/etc/apache \ +%if %{with_mod_php_mbregex} == yes + --enable-mbregex \ +%endif +%if %{with_mod_php_mbstring} == yes + --enable-mbstring \ +%endif %if %{with_mod_php_calendar} == yes --enable-calendar \ %endif @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7204 -r1.7205 news.txt --- openpkg-web/news.txt 28 Oct 2003 15:27:08 - 1.7204 +++ openpkg-web/news.txt 28 Oct 2003 16:13:57 - 1.7205 @@ -1,30 +1,4 @@ -28-Oct-2003: Upgraded package: Pskey-1.1.5-20031028 -28-Oct-2003: Upgraded package: Papache-1.3.27-1.2.3 -28-Oct-2003: Upgraded package: Papache-1.3.28-1.3.1 -28-Oct-2003: Upgraded package: Papache2-2.0.48-20031028 28-Oct-2003: Upgraded package: Papache-1.3.29-20031028 -28-Oct-2003: Upgraded package: Ppostfix-2.0.16-20031028 -28-Oct-2003: Upgraded package: Pfsl-1.3.0-1.3.2 -28-Oct-2003: Upgraded package: Popenpkg-20031028-20031028 -27-Oct-2003: Upgraded package: Pdbtool-1.6-20031027 -27-Oct-2003: Upgraded package: Pcvs-1.12.2-20031027 -27-Oct-2003: Upgraded package: Pperl-tk-20031027-20031027 -27-Oct-2003: Upgraded package: Ppowerdns-2.9.12-20031027 -27-Oct-2003: Upgraded package: Pbs-0.98c8-20031027 -27-Oct-2003: Upgraded package: Pgqview-1.3.3-20031027 -27-Oct-2003: Upgraded package: Popenpkg-20031027-20031027 -27-Oct-2003: Upgraded package: Pgnutls-0.9.93-20031027 -27-Oct-2003: Upgraded package: Pgcrypt-1.1.43-20031027 -27-Oct-2003: New package: Pgpg-error-0.5-20031027 -27-Oct-2003: Upgraded package: Pvim-6.2.135-20031027 -27-Oct-2003: Upgraded package: Pxterm-1.81-20031027 -27-Oct-2003: Upgraded package: Pperl-dbi-20031027-20031027 - news.txt -27-Oct-2003: Upgraded package: Pperl-www-20031027-20031027 -=== -27-Oct-2003: New package: Pgqview-1.3.3-20031027 -27-Oct-2003: Upgraded package: Pperl-www-20031027-20031027 - 1.7183 27-Oct-2003: Upgraded package: Pmplayer-1.0pre2-20031027 27-Oct-2003: Upgraded package: Pmonit-4.1-20031027 27-Oct-2003: Upgraded package: Pzoem-03.300-20031027 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/perl/ perl.patch perl.spec openpkg-web/ new...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 28-Oct-2003 17:14:08 Branch: HEAD Handle: 2003102816140701 Modified files: openpkg-src/perlperl.patch perl.spec openpkg-web news.txt Log: port to OpenDarwin 6.6.2 Summary: RevisionChanges Path 1.10+64 -0 openpkg-src/perl/perl.patch 1.82+1 -1 openpkg-src/perl/perl.spec 1.7206 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-src/perl/perl.patch $ cvs diff -u -r1.9 -r1.10 perl.patch --- openpkg-src/perl/perl.patch 26 Sep 2003 07:34:19 - 1.9 +++ openpkg-src/perl/perl.patch 28 Oct 2003 16:14:08 - 1.10 @@ -118,3 +118,67 @@ #ifdef PERL_OTHERLIBDIRS incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE); #endif + +- + +Port to [Open]Darwin 6.6.2: + +1. In OpenPKG, Perl does not use the vendor GCC and our GCC does not + understand -no-cpp-precomp, so remove this build option. + +2. The sys/mman.h indirectly includes system specific headers + which in turn have fields named environ while Perl uses + a define of environ internally. So wrap the inclusion. + +3. Darwin 6 no longer accepts the non-standard #import statements, + so replace with #include and circumvent some header problem + related to the non-standard __private_extern__ attribute. + +Index: hints/darwin.sh +--- hints/darwin.sh.orig 2003-09-02 15:40:19.0 +0200 hints/darwin.sh 2003-10-28 16:40:57.0 +0100 +@@ -115,9 +115,6 @@ + *-2147483648) ccflags=${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN ;; + esac + +-# Avoid Apple's cpp precompiler, better for extensions +-cppflags=${cppflags} -no-cpp-precomp +- + # This is necessary because perl's build system doesn't + # apply cppflags to cc compile lines as it should. + ccflags=${ccflags} ${cppflags} +Index: perlio.c +--- perlio.c.orig2003-09-24 22:50:22.0 +0200 perlio.c 2003-10-28 17:03:59.0 +0100 +@@ -432,7 +432,14 @@ + #include unistd.h + #endif + #ifdef HAS_MMAP ++#ifdef PERL_DARWIN ++#define environ_safe environ ++#undef environ + #include sys/mman.h ++#define environ environ_safe ++#else ++#include sys/mman.h ++#endif + #endif + + /* +Index: ext/DynaLoader/dl_dyld.xs +--- ext/DynaLoader/dl_dyld.xs.orig 2003-09-02 15:39:27.0 +0200 ext/DynaLoader/dl_dyld.xs2003-10-28 17:07:31.0 +0100 +@@ -45,7 +45,13 @@ + + #undef environ + #undef bool ++#ifdef PERL_DARWIN ++#define __private_extern__ extern ++#include mach-o/dyld.h ++#undef __private_extern__ ++#else + #import mach-o/dyld.h ++#endif + + static char *dlerror() + { @@ . patch -p0 '@@ .' Index: openpkg-src/perl/perl.spec $ cvs diff -u -r1.81 -r1.82 perl.spec --- openpkg-src/perl/perl.spec26 Sep 2003 07:34:19 - 1.81 +++ openpkg-src/perl/perl.spec28 Oct 2003 16:14:08 - 1.82 @@ -33,7 +33,7 @@ Group:Language License: GPL/Artistic Version: 5.8.1 -Release: 20030926 +Release: 20031028 # list of sources Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7205 -r1.7206 news.txt --- openpkg-web/news.txt 28 Oct 2003 16:13:57 - 1.7205 +++ openpkg-web/news.txt 28 Oct 2003 16:14:07 - 1.7206 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Pperl-5.8.1-20031028 28-Oct-2003: Upgraded package: Papache-1.3.29-20031028 27-Oct-2003: Upgraded package: Pmplayer-1.0pre2-20031027 27-Oct-2003: Upgraded package: Pmonit-4.1-20031027 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.fsl openpkg-src/fsl/ fsl.spec ope...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web openpkg$ Date: 28-Oct-2003 17:14:27 Branch: HEAD Handle: 2003102816142402 Modified files: openpkg-re/vcheck vc.fsl openpkg-src/fsl fsl.spec openpkg-web news.txt Log: upgrading package: fsl 1.3.0 - 1.4a1 Summary: RevisionChanges Path 1.26+1 -1 openpkg-re/vcheck/vc.fsl 1.56+2 -2 openpkg-src/fsl/fsl.spec 1.7207 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-re/vcheck/vc.fsl $ cvs diff -u -r1.25 -r1.26 vc.fsl --- openpkg-re/vcheck/vc.fsl 6 Oct 2003 11:55:47 - 1.25 +++ openpkg-re/vcheck/vc.fsl 28 Oct 2003 16:14:24 - 1.26 @@ -2,7 +2,7 @@ } prog fsl = { - version = 1.3.0 + version = 1.4a1 url = ftp://ftp.ossp.org/pkg/lib/fsl/ regex = fsl-(__VER__)\.tar\.gz } @@ . patch -p0 '@@ .' Index: openpkg-src/fsl/fsl.spec $ cvs diff -u -r1.55 -r1.56 fsl.spec --- openpkg-src/fsl/fsl.spec 20 Oct 2003 12:48:09 - 1.55 +++ openpkg-src/fsl/fsl.spec 28 Oct 2003 16:14:26 - 1.56 @@ -32,8 +32,8 @@ Distribution: OpenPKG [CORE] Group:System License: MIT-style -Version: 1.3.0 -Release: 20031020 +Version: 1.4a1 +Release: 20031028 # package options %option with_fsl_debuglogcode no @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7206 -r1.7207 news.txt --- openpkg-web/news.txt 28 Oct 2003 16:14:07 - 1.7206 +++ openpkg-web/news.txt 28 Oct 2003 16:14:25 - 1.7207 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Pfsl-1.4a1-20031028 28-Oct-2003: Upgraded package: Pperl-5.8.1-20031028 28-Oct-2003: Upgraded package: Papache-1.3.29-20031028 27-Oct-2003: Upgraded package: Pmplayer-1.0pre2-20031027 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ todo.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-re Date: 28-Oct-2003 17:22:33 Branch: HEAD Handle: 2003102816223300 Modified files: openpkg-re todo.txt Log: flush Summary: RevisionChanges Path 1.137 +6 -2 openpkg-re/todo.txt patch -p0 '@@ .' Index: openpkg-re/todo.txt $ cvs diff -u -r1.136 -r1.137 todo.txt --- openpkg-re/todo.txt 24 Oct 2003 14:41:28 - 1.136 +++ openpkg-re/todo.txt 28 Oct 2003 16:22:33 - 1.137 @@ -7,14 +7,15 @@ - [rse] dict[d] - [rse] logrotate - - [rse] mailman + - [rse] mailman - [rse] nagios 3. PERHAPS: - [ext] bb - [rse] diablo - - [rse] imake + - [cs] hylafax + - [rse] imake - [ext] interbase - [rse] libgsasl - [ext] lprng/ifhp @@ -28,6 +29,8 @@ - [rse] opengroupware - [rse] openoffice - [rse] php5 (+ apache:with_mod_php5) + - [cs] pear- http://pear.php.net/ + pear-*separate PEAR packages, similar to perl-* - [rse] rmagic - [rse] sablevm - [rse] sapdb/mysql-maxdb @@ -40,6 +43,7 @@ - [ext] tuxpaint - [ext] wmf - [rse] xfree86 + - [cs] xlhtml - [ext] xprobe - [ext] apache2 - full support - [ext] tightvnc- client+server @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/m4/ m4.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 28-Oct-2003 19:36:41 Branch: HEAD Handle: 2003102818363901 Modified files: openpkg-src/m4 m4.spec openpkg-web news.txt Log: update config.* scripts to newer versions and this way especially port to OpenDarwin Summary: RevisionChanges Path 1.26+4 -3 openpkg-src/m4/m4.spec 1.7208 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-src/m4/m4.spec $ cvs diff -u -r1.25 -r1.26 m4.spec --- openpkg-src/m4/m4.spec6 Oct 2003 18:56:09 - 1.25 +++ openpkg-src/m4/m4.spec28 Oct 2003 18:36:40 - 1.26 @@ -33,7 +33,7 @@ Group:Language License: GPL Version: 1.4o -Release: 20031006 +Release: 20031028 # list of sources Source0: ftp://ftp.seindal.dk/pub/rene/gnu/m4-%{version}.tar.gz @@ -43,8 +43,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg = 20020206, make -PreReq: OpenPKG, openpkg = 20020206 +BuildPreReq: OpenPKG, openpkg = 20030103, make +PreReq: OpenPKG, openpkg = 20030103 AutoReq: no AutoReqProv: no @@ -58,6 +58,7 @@ %prep %setup -q %patch -p0 +%update_config_scripts %build # configure package @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7207 -r1.7208 news.txt --- openpkg-web/news.txt 28 Oct 2003 16:14:25 - 1.7207 +++ openpkg-web/news.txt 28 Oct 2003 18:36:39 - 1.7208 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Pm4-1.4o-20031028 28-Oct-2003: Upgraded package: Pfsl-1.4a1-20031028 28-Oct-2003: Upgraded package: Pperl-5.8.1-20031028 28-Oct-2003: Upgraded package: Papache-1.3.29-20031028 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.perl-net openpkg-src/perl-net/ pe...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web openpkg$ Date: 28-Oct-2003 19:42:35 Branch: HEAD Handle: 2003102818423202 Modified files: openpkg-re/vcheck vc.perl-net openpkg-src/perl-netperl-net.spec openpkg-web news.txt Log: upgrading package: perl-net 20030926 - 20031028 Summary: RevisionChanges Path 1.29+1 -1 openpkg-re/vcheck/vc.perl-net 1.45+3 -3 openpkg-src/perl-net/perl-net.spec 1.7209 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-re/vcheck/vc.perl-net $ cvs diff -u -r1.28 -r1.29 vc.perl-net --- openpkg-re/vcheck/vc.perl-net 26 Sep 2003 07:36:31 - 1.28 +++ openpkg-re/vcheck/vc.perl-net 28 Oct 2003 18:42:32 - 1.29 @@ -12,7 +12,7 @@ regex = libnet-(__VER__)\.tar\.gz } prog perl-net:Net-BGP = { - version = 0.05 + version = 0.07 url = http://www.cpan.org/modules/by-module/Net/ regex = Net-BGP-(__VER__)\.tar\.gz } @@ . patch -p0 '@@ .' Index: openpkg-src/perl-net/perl-net.spec $ cvs diff -u -r1.44 -r1.45 perl-net.spec --- openpkg-src/perl-net/perl-net.spec26 Sep 2003 07:36:34 - 1.44 +++ openpkg-src/perl-net/perl-net.spec28 Oct 2003 18:42:34 - 1.45 @@ -37,7 +37,7 @@ %define V_plrpc 0.2017 %define V_curl_easy 1.35 %define V_net_imap_simple 0.93 -%define V_net_bgp 0.05 +%define V_net_bgp 0.07 # package information Name: perl-net @@ -48,8 +48,8 @@ Distribution: OpenPKG [BASE] Group:Language License: GPL/Artistic -Version: 20030926 -Release: 20030926 +Version: 20031028 +Release: 20031028 # package options %option with_curl no @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7208 -r1.7209 news.txt --- openpkg-web/news.txt 28 Oct 2003 18:36:39 - 1.7208 +++ openpkg-web/news.txt 28 Oct 2003 18:42:33 - 1.7209 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Pperl-net-20031028-20031028 28-Oct-2003: Upgraded package: Pm4-1.4o-20031028 28-Oct-2003: Upgraded package: Pfsl-1.4a1-20031028 28-Oct-2003: Upgraded package: Pperl-5.8.1-20031028 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.perl-xml openpkg-src/perl-xml/ pe...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web openpkg$ Date: 28-Oct-2003 19:42:49 Branch: HEAD Handle: 2003102818424702 Modified files: openpkg-re/vcheck vc.perl-xml openpkg-src/perl-xmlperl-xml.spec openpkg-web news.txt Log: upgrading package: perl-xml 20031023 - 20031028 Summary: RevisionChanges Path 1.78+1 -1 openpkg-re/vcheck/vc.perl-xml 1.100 +3 -3 openpkg-src/perl-xml/perl-xml.spec 1.7210 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-re/vcheck/vc.perl-xml $ cvs diff -u -r1.77 -r1.78 vc.perl-xml --- openpkg-re/vcheck/vc.perl-xml 27 Oct 2003 14:54:57 - 1.77 +++ openpkg-re/vcheck/vc.perl-xml 28 Oct 2003 18:42:47 - 1.78 @@ -2,7 +2,7 @@ } prog perl-xml:HTML-Parser = { - version = 3.33 + version = 3.34 url = http://www.cpan.org/modules/by-module/HTML/ regex = HTML-Parser-(__VER__)\.tar\.gz } @@ . patch -p0 '@@ .' Index: openpkg-src/perl-xml/perl-xml.spec $ cvs diff -u -r1.99 -r1.100 perl-xml.spec --- openpkg-src/perl-xml/perl-xml.spec23 Oct 2003 20:17:51 - 1.99 +++ openpkg-src/perl-xml/perl-xml.spec28 Oct 2003 18:42:49 - 1.100 @@ -45,7 +45,7 @@ %define V_xml_quote1.02 %define V_xml_xupdate_libxml 0.5.0 %define V_html_tagset 3.03 -%define V_html_parser 3.33 +%define V_html_parser 3.34 %define V_html_tree3.18 %define V_html_table 1.20 %define V_html_tagreader 1.06 @@ -65,8 +65,8 @@ Distribution: OpenPKG [BASE] Group:Language License: GPL/Artistic -Version: 20031023 -Release: 20031023 +Version: 20031028 +Release: 20031028 # package options %option with_libxmlno @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7209 -r1.7210 news.txt --- openpkg-web/news.txt 28 Oct 2003 18:42:33 - 1.7209 +++ openpkg-web/news.txt 28 Oct 2003 18:42:48 - 1.7210 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Pperl-xml-20031028-20031028 28-Oct-2003: Upgraded package: Pperl-net-20031028-20031028 28-Oct-2003: Upgraded package: Pm4-1.4o-20031028 28-Oct-2003: Upgraded package: Pfsl-1.4a1-20031028 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.perl-tk openpkg-src/perl-tk/ perl...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web openpkg$ Date: 28-Oct-2003 19:52:12 Branch: HEAD Handle: 2003102818520902 Modified files: openpkg-re/vcheck vc.perl-tk openpkg-src/perl-tk perl-tk.spec openpkg-web news.txt Log: upgrading package: perl-tk 20031027 - 20031028 Summary: RevisionChanges Path 1.20+2 -2 openpkg-re/vcheck/vc.perl-tk 1.35+4 -4 openpkg-src/perl-tk/perl-tk.spec 1.7211 +1 -0 openpkg-web/news.txt patch -p0 '@@ .' Index: openpkg-re/vcheck/vc.perl-tk $ cvs diff -u -r1.19 -r1.20 vc.perl-tk --- openpkg-re/vcheck/vc.perl-tk 27 Oct 2003 18:56:52 - 1.19 +++ openpkg-re/vcheck/vc.perl-tk 28 Oct 2003 18:52:09 - 1.20 @@ -47,7 +47,7 @@ regex = Tk-Graph-(__VER__)\.tar\.gz } prog perl-tk:Tk-HistEntry = { - version = 0.41 + version = 0.42 url = http://www.cpan.org/modules/by-module/Tk/ regex = Tk-HistEntry-(__VER__)\.tar\.gz } @@ -127,7 +127,7 @@ regex = Tk-TextANSIColor-(__VER__)\.tar\.gz } prog perl-tk:Tk-TIFF = { - version = 0.08 + version = 0.09 url = http://www.cpan.org/modules/by-module/Tk/ regex = Tk-TIFF-(__VER__)\.tar\.gz } @@ . patch -p0 '@@ .' Index: openpkg-src/perl-tk/perl-tk.spec $ cvs diff -u -r1.34 -r1.35 perl-tk.spec --- openpkg-src/perl-tk/perl-tk.spec 27 Oct 2003 18:56:54 - 1.34 +++ openpkg-src/perl-tk/perl-tk.spec 28 Oct 2003 18:52:11 - 1.35 @@ -25,7 +25,7 @@ # versions of individual parts %define V_tk 804.025_beta4 -%define V_tk_tiff 0.08 +%define V_tk_tiff 0.09 %define V_tk_jpeg 2.014 %define V_tk_png 2.005 %define V_tk_canvasfig 1.014 @@ -36,7 +36,7 @@ %define V_tk_executecommand1.4 %define V_tk_gbarr 2.06 %define V_tk_graph 0.06 -%define V_tk_histentry 0.41 +%define V_tk_histentry 0.42 %define V_tk_jcombobox 0.02 %define V_tk_ipentry 0.03 %define V_tk_lcd 1.3 @@ -64,8 +64,8 @@ Distribution: OpenPKG [BASE] Group:Language License: GPL/Artistic -Version: 20031027 -Release: 20031027 +Version: 20031028 +Release: 20031028 # list of sources Source0: http://www.cpan.org/modules/by-module/Tk/Tk-%{V_tk}.tar.gz @@ . patch -p0 '@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7210 -r1.7211 news.txt --- openpkg-web/news.txt 28 Oct 2003 18:42:48 - 1.7210 +++ openpkg-web/news.txt 28 Oct 2003 18:52:10 - 1.7211 @@ -1,3 +1,4 @@ +28-Oct-2003: Upgraded package: Pperl-tk-20031028-20031028 28-Oct-2003: Upgraded package: Pperl-xml-20031028-20031028 28-Oct-2003: Upgraded package: Pperl-net-20031028-20031028 28-Oct-2003: Upgraded package: Pm4-1.4o-20031028 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[OpenPKG] Version Tracking Report (2003-10-29 07:24)
OpenPKG Version Tracking Report === Reporting Time:2003-10-29 07:24 Tracking Duration: 0:24:24 (H:M:S) Tracking Input:918 sources (612 packages) Tracking Result: 879 up-to-date, 7 out-dated, 32 error The following 7 sources were determined to be out-dated because newer vendor versions were found. Upgrade the corresponding OpenPKG packages. - - - Package Old Version New Version - - - gcc34 3.4-20031015 3.4-20031022 [1] gtk2 2.2.4 2.3.0 libxml2.6.0 2.6.1 mng 1.0.5 1.0.6 [2] mozilla-mplayer 1.0pre2-test4 1.0pre2 perl-comp:Compress-Zlib 1.22 1.30 xine-lib 1-rc1 1-rc2 [3] - - - [1] gcc34: rse: 3.4-20031022 causes an ICE in cgraph_function_possibly_inlined_p, at cgraph.c:541 [2] mng: rse: 1.0.6 as of 19-Oct-2003 had no pre-generated Autoconf/Automake files at all [3] xine-lib: rse: 1-rc2: FBIOVERTICAL undeclared The following 32 sources could not be successfully checked because an error occurred while processing. Keep at least an eye on them. - - - Package Old Version Error - - - calamaris 2.58 regex didn't match (pro.. cocor 17connection failed or ti.. cups 1.1.192nd connection failed o.. expect:tcl8.4.4 connection failed or ti.. flex:release 2.5.4aconnection failed or ti.. gcc32:bounds 3.2.3-1.01regex didn't match (pro.. glimpse 4.17.4latest version online [1] hexcurse 1.54 regex didn't match (pro.. ircii 20030709 connection failed or ti.. kde-qt3.1.2 connection failed or ti.. libart2.3.162nd connection failed o.. libmikmod 3.1.10connection failed or ti.. max 7.4.2 regex didn't match (pro.. mozilla 1.5 1st connection failed o.. nessus-libs:libnasl 2.0.8alatest version online l.. nessus-libs:nessus-libraries 2.0.8alatest version online l.. nessus-tool:nessus-core 2.0.8alatest version online l.. nessus-tool:nessus-plugins 2.0.8alatest version online l.. nspr 4.3 1st connection failed o.. ocaml 3.07 regex didn't match (pro.. patch:alpha 2.5.9 connection failed or ti.. postgresql7.3.4 1st connection failed o.. postgresql:psqlodbc 07.03.0200connection failed or ti.. rdist 7.0.0-alpha10 connection failed or ti.. ruby 1.8.0 connection failed or ti.. smtpfeed 1.18 connection failed or [2] suck 4.3.2 connection failed or [3] tcl:tcl 8.4.4 connection failed or ti.. tcl:tk8.4.4 connection failed or ti.. tomcat4-adapter 4.1.241st regex didn't match .. tsmc:solaris 22658 2nd regex didn't matc [4] vcheck1.2.1 regex didn't match (p [5] - - - [1] glimpse: rse: website still does not show latest version [2] smtpfeed: thl: master site down and only known mirror is netsw! [3] suck: rse: domain expired, still no new home known [4] tsmc:solaris: rse: 22658 was 5.1.6.2 [5] vcheck: rse: webserver currently broken The remaining 879 sources were successfully determined to be still up to date. No action is required on your part. Just be happy ;) OpenPKG Version Tracker [EMAIL PROTECTED] __ The