OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Jan-2007 18:00:55
Branch: OPENPKG_2_STABLE Handle: 2007012617004409
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apache2 apache2.patch apache2.spec
openpkg-src/bogofilter bogofilter.patch bogofilter.spec
openpkg-src/data-timezone
data-timezone.spec
openpkg-src/exim exim.spec rc.exim
openpkg-src/freetype freetype.patch freetype.spec
openpkg-src/kwiki kwiki.spec
openpkg-src/openssl openssl.spec
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
openpkg-src/perl-vcs perl-vcs.spec
Log:
MFC: make up leeway for 2_STABLE by virtue of build-time results
Summary:
Revision Changes Path
1.11.2.2 +8 -149 openpkg-src/apache2/apache2.patch
1.74.2.5 +4 -4 openpkg-src/apache2/apache2.spec
1.2.4.1 +6 -6 openpkg-src/bogofilter/bogofilter.patch
1.105.2.3 +8 -4 openpkg-src/bogofilter/bogofilter.spec
1.11.2.4 +4 -4 openpkg-src/data-timezone/data-timezone.spec
1.98.2.4 +4 -4 openpkg-src/exim/exim.spec
1.16.10.2 +12 -0 openpkg-src/exim/rc.exim
1.7.2.1 +3 -3 openpkg-src/freetype/freetype.patch
1.58.2.3 +4 -4 openpkg-src/freetype/freetype.spec
1.75.2.3 +5 -5 openpkg-src/kwiki/kwiki.spec
1.73.2.5 +8 -6 openpkg-src/openssl/openssl.spec
1.18.2.2 +17 -6 openpkg-src/perl-dbi/perl-dbi.patch
1.202.2.6 +4 -4 openpkg-src/perl-dbi/perl-dbi.spec
1.18.2.3 +4 -4 openpkg-src/perl-vcs/perl-vcs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.patch
============================================================================
$ cvs diff -u -r1.11.2.1 -r1.11.2.2 apache2.patch
--- openpkg-src/apache2/apache2.patch 16 Oct 2006 14:47:41 -0000 1.11.2.1
+++ openpkg-src/apache2/apache2.patch 26 Jan 2007 17:00:44 -0000 1.11.2.2
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2006-04-22 05:54:22 +0200
-+++ configure 2006-04-30 09:59:39 +0200
-@@ -2682,6 +2682,11 @@
+--- configure.orig 2007-01-06 07:40:00 +0100
++++ configure 2007-01-10 19:46:27 +0100
+@@ -2711,6 +2711,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -13,7 +13,7 @@
if test "$apr_found" = "reconfig"; then
# save our work to this point; this allows the sub-package to use it
-@@ -3010,6 +3015,11 @@
+@@ -3047,6 +3052,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -27,7 +27,7 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig 2006-01-29 23:34:37 +0100
-+++ docs/conf/mime.types 2006-09-11 17:33:28 +0200
++++ docs/conf/mime.types 2007-01-10 19:46:27 +0100
@@ -265,6 +265,22 @@
application/vnd.novadigm.edm
application/vnd.novadigm.edx
@@ -53,7 +53,7 @@
application/vnd.palm
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2006-04-30 09:59:39 +0200
++++ server/Makefile.in 2007-01-10 19:46:27 +0100
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -65,8 +65,8 @@
for dir in $(EXPORT_DIRS_APR); do \
(ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
Index: srclib/apr-util/crypto/getuuid.c
---- srclib/apr-util/crypto/getuuid.c.orig 2005-02-04 21:45:35 +0100
-+++ srclib/apr-util/crypto/getuuid.c 2006-04-30 09:59:39 +0200
+--- srclib/apr-util/crypto/getuuid.c.orig 2006-04-14 20:01:58 +0200
++++ srclib/apr-util/crypto/getuuid.c 2007-01-10 19:46:27 +0100
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -76,144 +76,3 @@
srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
return rand() & 0x0FFFF;
-@@ -151,7 +151,7 @@
- static apr_interval_time_t time_last = 0;
- static apr_interval_time_t fudge = 0;
-
-- time_now = apr_time_now();
-+ get_system_time(&time_now);
-
- /* if clock reading changed since last UUID generated... */
- if (time_last != time_now) {
-@@ -188,17 +188,26 @@
-
- get_current_time(×tamp);
-
-- d[0] = (unsigned char)timestamp;
-- d[1] = (unsigned char)(timestamp >> 8);
-- d[2] = (unsigned char)(timestamp >> 16);
-- d[3] = (unsigned char)(timestamp >> 24);
-- d[4] = (unsigned char)(timestamp >> 32);
-- d[5] = (unsigned char)(timestamp >> 40);
-- d[6] = (unsigned char)(timestamp >> 48);
-- d[7] = (unsigned char)(((timestamp >> 56) & 0x0F) | 0x10);
-+ /* UUID field: time_low */
-+ d[0] = (unsigned char)(timestamp >> (8*3));
-+ d[1] = (unsigned char)(timestamp >> (8*2));
-+ d[2] = (unsigned char)(timestamp >> (8*1));
-+ d[3] = (unsigned char)(timestamp);
-+
-+ /* UUID field: time_mid */
-+ d[4] = (unsigned char)(timestamp >> (8*5));
-+ d[5] = (unsigned char)(timestamp >> (8*4));
-+
-+ /* UUID field: time_hi_and_version */
-+ d[6] = (unsigned char)(((timestamp >> (8*7)) & 0x0F) | 0x10);
-+ d[7] = (unsigned char)(timestamp >> (8*6));
-
-+ /* UUID field: clk_seq_hi_res */
- d[8] = (unsigned char)(((uuid_state_seqnum >> 8) & 0x3F) | 0x80);
-+
-+ /* UUID field: clk_seq_low */
- d[9] = (unsigned char)uuid_state_seqnum;
-
-+ /* UUID field: node */
- memcpy(&d[10], uuid_state_node, NODE_LENGTH);
- }
-Index: srclib/apr-util/dbd/apr_dbd_sqlite3.c
---- srclib/apr-util/dbd/apr_dbd_sqlite3.c.orig 2006-03-15 07:04:54
+0100
-+++ srclib/apr-util/dbd/apr_dbd_sqlite3.c 2006-04-30 10:02:32 +0200
-@@ -39,7 +39,9 @@
- struct apr_dbd_t {
- sqlite3 *conn;
- apr_dbd_transaction_t *trans;
-+#if APR_HAS_THREADS
- apr_thread_mutex_t *mutex;
-+#endif
- apr_pool_t *pool;
- };
-
-@@ -93,11 +95,15 @@
- return sql->trans->errnum;
- }
-
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
-
- ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
- if (!dbd_sqlite3_is_success(ret)) {
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- return ret;
- } else {
- int column_count;
-@@ -118,9 +124,13 @@
- if (retry_count++ > MAX_RETRY_COUNT) {
- ret = SQLITE_ERROR;
- } else {
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- apr_sleep(MAX_RETRY_SLEEP);
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
- }
- } else if (ret == SQLITE_ROW) {
- int length;
-@@ -179,7 +189,9 @@
- } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
- }
- ret = sqlite3_finalize(stmt);
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
-
- if (sql->trans) {
- sql->trans->errnum = ret;
-@@ -242,7 +254,9 @@
- }
-
- length = strlen(query);
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
-
- do {
- ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
-@@ -260,7 +274,9 @@
- if (dbd_sqlite3_is_success(ret)) {
- ret = 0;
- }
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- if (sql->trans) {
- sql->trans->errnum = ret;
- }
-@@ -367,11 +383,13 @@
- sql->pool = pool;
- sql->trans = NULL;
- /* Create a mutex */
-+#if APR_HAS_THREADS
- res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT,
- pool);
- if (res != APR_SUCCESS) {
- return NULL;
- }
-+#endif
-
- return sql;
- }
-@@ -379,7 +397,9 @@
- static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
- {
- sqlite3_close(handle->conn);
-+#if APR_HAS_THREADS
- apr_thread_mutex_destroy(handle->mutex);
-+#endif
- return APR_SUCCESS;
- }
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.74.2.4 -r1.74.2.5 apache2.spec
--- openpkg-src/apache2/apache2.spec 22 Dec 2006 21:09:12 -0000 1.74.2.4
+++ openpkg-src/apache2/apache2.spec 26 Jan 2007 17:00:45 -0000 1.74.2.5
@@ -1,7 +1,7 @@
##
## apache2.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -25,7 +25,7 @@
# FIXME: with_mod_perl broken
# package version
-%define V_apache 2.2.3
+%define V_apache 2.2.4
%define V_mod_perl 2.0.3
# package information
@@ -39,7 +39,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 2.20061222
+Release: 2.20070126
# package options (generic)
%option with_mpm prefork
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bogofilter/bogofilter.patch
============================================================================
$ cvs diff -u -r1.2 -r1.2.4.1 bogofilter.patch
--- openpkg-src/bogofilter/bogofilter.patch 25 Sep 2005 17:37:12 -0000
1.2
+++ openpkg-src/bogofilter/bogofilter.patch 26 Jan 2007 17:00:46 -0000
1.2.4.1
@@ -1,10 +1,10 @@
Index: src/Makefile.in
---- src/Makefile.in.orig 2005-09-25 17:02:39 +0200
-+++ src/Makefile.in 2005-09-25 19:36:29 +0200
-@@ -500,7 +500,7 @@
- @[EMAIL PROTECTED]/gsl/sys/pow_int.c ../gsl/sys/minmax.c
-
- @[EMAIL PROTECTED] = -I$(top_srcdir)
+--- src/Makefile.in.orig 2007-01-01 21:23:10 +0100
++++ src/Makefile.in 2007-01-02 09:16:43 +0100
+@@ -495,7 +495,7 @@
+ @[EMAIL PROTECTED] = memdebug.c memdebug.h
+ noinst_LIBRARIES = libbogofilter.a $(am__append_3) $(am__append_5) \
+ $(am__append_10)
[EMAIL PROTECTED]@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt
-I$(top_srcdir)/trio -I- -I. \
[EMAIL PROTECTED]@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt
-I$(top_srcdir)/trio -iquote -I. \
@USE_GCC4_FALSE@ -I$(srcdir) @GSL_CFLAGS@
-I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bogofilter/bogofilter.spec
============================================================================
$ cvs diff -u -r1.105.2.2 -r1.105.2.3 bogofilter.spec
--- openpkg-src/bogofilter/bogofilter.spec 16 Oct 2006 14:48:39 -0000
1.105.2.2
+++ openpkg-src/bogofilter/bogofilter.spec 26 Jan 2007 17:00:46 -0000
1.105.2.3
@@ -1,7 +1,7 @@
##
## bogofilter.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -32,8 +32,8 @@
Class: BASE
Group: Mail
License: GPL
-Version: 1.1.1
-Release: 2.20061018
+Version: 1.1.5
+Release: 2.20070126
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/bogofilter/bogofilter-%{version}.tar.bz2
@@ -66,6 +66,9 @@
%prep
%setup -q
%patch -p0
+ %{l_shtool} subst \
+ -e 's;patch ;%{l_patch} ;g' \
+ src/Makefile.in
case "%{l_platform -t}" in
*-sunos* )
%{l_shtool} subst \
@@ -80,6 +83,7 @@
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
LIBS="$LIBS$extlibs" \
+ GREP="grep" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/bogofilter \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/data-timezone/data-timezone.spec
============================================================================
$ cvs diff -u -r1.11.2.3 -r1.11.2.4 data-timezone.spec
--- openpkg-src/data-timezone/data-timezone.spec 22 Dec 2006 19:13:19
-0000 1.11.2.3
+++ openpkg-src/data-timezone/data-timezone.spec 26 Jan 2007 17:00:47
-0000 1.11.2.4
@@ -1,7 +1,7 @@
##
## data-timezone.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -32,8 +32,8 @@
Class: BASE
Group: Data
License: Open Source
-Version: 2006p
-Release: 2.20061222
+Version: 2007a
+Release: 2.20070126
# list of sources
Source0: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/exim.spec
============================================================================
$ cvs diff -u -r1.98.2.3 -r1.98.2.4 exim.spec
--- openpkg-src/exim/exim.spec 22 Dec 2006 21:09:15 -0000 1.98.2.3
+++ openpkg-src/exim/exim.spec 26 Jan 2007 17:00:47 -0000 1.98.2.4
@@ -1,7 +1,7 @@
##
## exim.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -32,8 +32,8 @@
Class: PLUS
Group: Mail
License: GPL
-Version: 4.64
-Release: 2.20061222
+Version: 4.66
+Release: 2.20070126
# package options
%option with_auth_cram_md5 no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/exim/rc.exim
============================================================================
$ cvs diff -u -r1.16.10.1 -r1.16.10.2 rc.exim
--- openpkg-src/exim/rc.exim 16 Oct 2006 14:49:52 -0000 1.16.10.1
+++ openpkg-src/exim/rc.exim 26 Jan 2007 17:00:47 -0000 1.16.10.2
@@ -8,7 +8,9 @@
MTA_aliases_file="@l_prefix@/etc/exim/aliases"
MTA_aliases_update="true"
exim_enable="$openpkg_rc_def"
+ exim_spool="@l_prefix@/var/exim/spool"
exim_flags="-bd -q30m"
+ exim_tidydb_flags="-t 7d"
exim_log_prolog="true"
exim_log_epilog="true"
exim_log_numfiles="10"
@@ -67,3 +69,13 @@
-E "${exim_log_epilog}" \
@l_prefix@/var/exim/log/{main,panic,reject}.log
+%weekly -u @l_rusr@
+ rcService exim enable yes || exit 0
+ if [ -d ${exim_spool}/db ]; then
+ for db in `find ${exim_spool}/db/ -name \*.lockfile -o -type f
-print |\
+ sed -n -e 's;^.*/\([^/]*\)$;\1;p'`; do
+ @l_prefix@/sbin/exim_tidydb ${exim_tidydb_flags} \
+ ${exim_spool} ${db} >/dev/null
+ done
+ fi
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.patch
============================================================================
$ cvs diff -u -r1.7 -r1.7.2.1 freetype.patch
--- openpkg-src/freetype/freetype.patch 14 May 2006 08:27:56 -0000
1.7
+++ openpkg-src/freetype/freetype.patch 26 Jan 2007 17:00:48 -0000
1.7.2.1
@@ -11,12 +11,12 @@
echo $cflags -I$includedir
else
Index: builds/unix/freetype2.in
---- builds/unix/freetype2.in.orig 2005-08-26 07:49:21 +0200
-+++ builds/unix/freetype2.in 2006-05-14 10:21:15 +0200
+--- builds/unix/freetype2.in 2006-10-12 06:51:08 +0200
++++ builds/unix/freetype2.in 2007-01-17 18:25:06 +0100
@@ -8,4 +8,4 @@
Version: @ft_version@
Requires:
- Libs: -L${libdir} -lfreetype @LIBZ@
+ Libs: -L${libdir} -lfreetype @LIBZ@ @FT2_EXTRA_LIBS@
-Cflags: -I${includedir}/freetype2 -I${includedir}
+Cflags: -I${includedir}
Index: builds/unix/install.mk
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.spec
============================================================================
$ cvs diff -u -r1.58.2.2 -r1.58.2.3 freetype.spec
--- openpkg-src/freetype/freetype.spec 16 Oct 2006 14:50:08 -0000
1.58.2.2
+++ openpkg-src/freetype/freetype.spec 26 Jan 2007 17:00:48 -0000
1.58.2.3
@@ -1,7 +1,7 @@
##
## freetype.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -32,8 +32,8 @@
Class: BASE
Group: Graphics
License: GPL
-Version: 2.2.1
-Release: 2.20061018
+Version: 2.3.0
+Release: 2.20070126
# list of sources
Source0:
http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kwiki/kwiki.spec
============================================================================
$ cvs diff -u -r1.75.2.2 -r1.75.2.3 kwiki.spec
--- openpkg-src/kwiki/kwiki.spec 16 Oct 2006 14:51:34 -0000 1.75.2.2
+++ openpkg-src/kwiki/kwiki.spec 26 Jan 2007 17:00:52 -0000 1.75.2.3
@@ -1,7 +1,7 @@
##
## kwiki.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -26,7 +26,7 @@
# package versions
%define V_perl 5.8.6
-%define V_spoon 0.23
+%define V_spoon 0.24
%define V_kwiki 0.38
%define V_kwiki_modperl 0.09
%define V_kwiki_anchorlink 0.03
@@ -101,7 +101,7 @@
%define V_kwiki_footnote 0.01
%define V_kwiki_raw 0.02
%define V_kwiki_trackback 0.01
-%define V_kwiki_typekey 0.07
+%define V_kwiki_typekey 0.08
%define V_kwiki_keywords 0.14
%define V_kwiki_blog 0.10
%define V_kwiki_listpages 0.11
@@ -119,7 +119,7 @@
Group: CMS
License: GPL/Artistic
Version: %{V_kwiki}
-Release: 2.20061018
+Release: 2.20070126
# list of sources
Source0:
http://www.cpan.org/authors/id/I/IN/INGY/Spoon-%{V_spoon}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssl/openssl.spec
============================================================================
$ cvs diff -u -r1.73.2.4 -r1.73.2.5 openssl.spec
--- openpkg-src/openssl/openssl.spec 16 Oct 2006 14:53:47 -0000 1.73.2.4
+++ openpkg-src/openssl/openssl.spec 26 Jan 2007 17:00:49 -0000 1.73.2.5
@@ -1,7 +1,7 @@
##
## openssl.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -33,7 +33,7 @@
Group: SSL
License: BSD-style
Version: 0.9.8d
-Release: 2.20061018
+Release: 2.20070126
# package options
%option with_zlib no
@@ -97,12 +97,14 @@
%if "%{with_pic}" == "yes"
options="$options -fPIC"
case "%{l_platform -t}" in
- amd64-* ) options="$options no-asm" ;;
+ amd64-* ) options="$options no-asm" ;;
+ sparc64-freebsd* ) options="$options no-asm" ;;
esac
%else
case "%{l_platform -t}" in
- amd64-* ) options="$options -fPIC no-asm" ;;
- ia64-* ) options="$options -fPIC" ;;
+ amd64-* ) options="$options -fPIC no-asm" ;;
+ ia64-* ) options="$options -fPIC" ;;
+ sparc64-freebsd* ) options="$options -fPIC no-asm" ;;
esac
%endif
%if "%{with_zlib}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.18.2.1 -r1.18.2.2 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 20 Sep 2006 19:26:48 -0000
1.18.2.1
+++ openpkg-src/perl-dbi/perl-dbi.patch 26 Jan 2007 17:00:53 -0000
1.18.2.2
@@ -1,6 +1,6 @@
Index: DBD-SQLite-1.13/Makefile.PL
---- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13.000000000 +0200
-+++ DBD-SQLite-1.13/Makefile.PL 2006-09-19 20:05:27.104172279 +0200
+--- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13 +0200
++++ DBD-SQLite-1.13/Makefile.PL 2007-01-08 19:32:01 +0100
@@ -10,34 +10,6 @@
}
use Config;
@@ -62,8 +62,8 @@
'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" .
( ($Config{d_usleep} ||
Index: DBD-SQLite-1.13/dbdimp.c
---- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50.000000000 +0200
-+++ DBD-SQLite-1.13/dbdimp.c 2006-09-19 20:03:45.164447005 +0200
+--- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50 +0200
++++ DBD-SQLite-1.13/dbdimp.c 2007-01-08 19:32:01 +0100
@@ -394,14 +394,17 @@
sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth));
@@ -84,8 +84,8 @@
sqlite3_reset(imp_sth->stmt);
imp_sth->nrow = sqlite3_changes(imp_dbh->db);
Index: DBD-SQLite-1.13/dbdimp.h
---- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50.000000000 +0200
-+++ DBD-SQLite-1.13/dbdimp.h 2006-09-19 20:03:45.164783426 +0200
+--- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50 +0200
++++ DBD-SQLite-1.13/dbdimp.h 2007-01-08 19:32:01 +0100
@@ -4,7 +4,7 @@
#define _DBDIMP_H 1
@@ -95,3 +95,14 @@
/* 30 second timeout by default */
#define SQL_TIMEOUT 30000
+Index: DBD-mysql-4.001/dbdimp.h
+--- DBD-mysql-4.001/dbdimp.h.orig 2007-01-06 20:00:08 +0100
++++ DBD-mysql-4.001/dbdimp.h 2007-01-08 19:32:01 +0100
+@@ -19,6 +19,7 @@
+ * Header files we use
+ */
+ #include <DBIXS.h> /* installed by the DBI module */
++#include <my_global.h>
+ #include <mysql.h> /* Comes with MySQL-devel */
+ #include <mysqld_error.h> /* Comes MySQL */
+ #include <errmsg.h> /* Comes with MySQL-devel */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.202.2.5 -r1.202.2.6 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 22 Dec 2006 19:13:28 -0000
1.202.2.5
+++ openpkg-src/perl-dbi/perl-dbi.spec 26 Jan 2007 17:00:53 -0000
1.202.2.6
@@ -1,7 +1,7 @@
##
## perl-dbi.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -35,7 +35,7 @@
%define V_dbd_csv 0.22
%define V_dbd_sprite 0.59
%define V_dbd_sqlite 1.13
-%define V_dbd_mysql 3.0008
+%define V_dbd_mysql 4.001
%define V_dbd_pgsql 1.49
%define V_dbd_oracle 1.19
%define V_dbd_sybase 1.07_01
@@ -53,7 +53,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 2.20061222
+Release: 2.20070126
# package options
%option with_dbd_sqlite yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-vcs/perl-vcs.spec
============================================================================
$ cvs diff -u -r1.18.2.2 -r1.18.2.3 perl-vcs.spec
--- openpkg-src/perl-vcs/perl-vcs.spec 16 Oct 2006 14:54:29 -0000
1.18.2.2
+++ openpkg-src/perl-vcs/perl-vcs.spec 26 Jan 2007 17:00:51 -0000
1.18.2.3
@@ -1,7 +1,7 @@
##
## perl-vcs.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -34,7 +34,7 @@
%define V_rcs_agent 1.03
%define V_rcs_parser 0.02
%define V_text_diff 0.35
-%define V_text_patch 1.1
+%define V_text_patch 1.2
# package information
Name: perl-vcs
@@ -47,7 +47,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 2.20061018
+Release: 2.20070126
# list of sources
Source0:
http://www.cpan.org/modules/by-module/Algorithm/Algorithm-Diff-%{V_algorithm_diff}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
