[CVS] OpenPKG: openpkg-src/crossroads/ crossroads.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 07-Dec-2006 08:41:29 Branch: HEAD Handle: 2006120707412900 Modified files: openpkg-src/crossroads crossroads.spec Log: upgrading package: crossroads 1.19 -> 1.20 Summary: RevisionChanges Path 1.22+2 -2 openpkg-src/crossroads/crossroads.spec patch -p0 <<'@@ .' Index: openpkg-src/crossroads/crossroads.spec $ cvs diff -u -r1.21 -r1.22 crossroads.spec --- openpkg-src/crossroads/crossroads.spec5 Dec 2006 07:30:31 - 1.21 +++ openpkg-src/crossroads/crossroads.spec7 Dec 2006 07:41:29 - 1.22 @@ -32,8 +32,8 @@ Class:EVAL Group:Network License: Open Source -Version: 1.19 -Release: 20061205 +Version: 1.20 +Release: 20061207 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/git/ git.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Dec-2006 08:39:25
Branch: HEAD Handle: 2006120707392500
Modified files:
openpkg-src/git git.spec
Log:
upgrading package: git 1.4.4.1 -> 1.4.4.2
Summary:
RevisionChanges Path
1.37+2 -2 openpkg-src/git/git.spec
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
$ cvs diff -u -r1.36 -r1.37 git.spec
--- openpkg-src/git/git.spec 23 Nov 2006 15:25:53 - 1.36
+++ openpkg-src/git/git.spec 7 Dec 2006 07:39:25 - 1.37
@@ -23,7 +23,7 @@
##
# package version
-%define V_git 1.4.4.1
+%define V_git 1.4.4.2
%define V_cogito0.18.2
%define V_stgit 0.11
@@ -38,7 +38,7 @@
Group:SCM
License: GPL
Version: %{V_git}
-Release: 20061123
+Release: 20061207
# list of sources
Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/md5sha1sum/ md5sha1sum.patch md5sha1sum.spe...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Dec-2006 08:39:15
Branch: HEAD Handle: 2006120707391500
Modified files:
openpkg-src/md5sha1sum md5sha1sum.patch md5sha1sum.spec
Log:
upgrade to 0.9.5 (upstream author has taken over our contributed patch
-- at least partly)
Summary:
RevisionChanges Path
1.2 +0 -15 openpkg-src/md5sha1sum/md5sha1sum.patch
1.2 +2 -2 openpkg-src/md5sha1sum/md5sha1sum.spec
patch -p0 <<'@@ .'
Index: openpkg-src/md5sha1sum/md5sha1sum.patch
$ cvs diff -u -r1.1 -r1.2 md5sha1sum.patch
--- openpkg-src/md5sha1sum/md5sha1sum.patch 6 Dec 2006 09:35:49 -
1.1
+++ openpkg-src/md5sha1sum/md5sha1sum.patch 7 Dec 2006 07:39:15 -
1.2
@@ -44,18 +44,3 @@
#include
#include "parseopts.h"
-@@ -161,11 +162,11 @@
-wrong */
-
- hashsize = strlen(opts->hashes[i]);
--if(strstr(argv[0], "sha1sum") && (hashsize != 40))
-+if(strstr(argv[0], "sha1sum") && (hashsize !=
(SHA_DIGEST_LENGTH * 2)))
- fputs("Warning: Hash size is wrong, maybe you want to
use 'md5sum'\n", stderr);
--if(strstr(argv[0], "ripemd160sum") && (hashsize != 40))
-+if(strstr(argv[0], "ripemd160sum") && (hashsize !=
(RIPEMD160_DIGEST_LENGTH * 2)))
- fputs("Warning: Hash size is wrong, maybe you want to
use 'md5sum'\n", stderr);
--if(!strstr(argv[0], "md5sum") && hashsize != 32)
-+if(strstr(argv[0], "md5sum") && (hashsize !=
(MD5_DIGEST_LENGTH * 2)))
- fputs("Warning: Hash size is wrong, maybe you want to
use 'sha1sum' or 'ripemd160sum'\n", stderr);
-
- if(opts->vmode == VMODE_SILENT) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/md5sha1sum/md5sha1sum.spec
$ cvs diff -u -r1.1 -r1.2 md5sha1sum.spec
--- openpkg-src/md5sha1sum/md5sha1sum.spec6 Dec 2006 09:35:49 -
1.1
+++ openpkg-src/md5sha1sum/md5sha1sum.spec7 Dec 2006 07:39:15 -
1.2
@@ -32,8 +32,8 @@
Class:EVAL
Group:Filesystem
License: GPL
-Version: 0.9.4
-Release: 20061206
+Version: 0.9.5
+Release: 20061207
# list of sources
Source0:
http://www.microbrew.org/tools/md5sha1sum/md5sha1sum-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/axl/ axl.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Dec-2006 08:37:29
Branch: HEAD Handle: 2006120707372900
Modified files:
openpkg-src/axl axl.spec
Log:
upgrading package: axl 0.2.7 -> 0.3.0
Summary:
RevisionChanges Path
1.8 +3 -3 openpkg-src/axl/axl.spec
patch -p0 <<'@@ .'
Index: openpkg-src/axl/axl.spec
$ cvs diff -u -r1.7 -r1.8 axl.spec
--- openpkg-src/axl/axl.spec 9 Nov 2006 15:12:12 - 1.7
+++ openpkg-src/axl/axl.spec 7 Dec 2006 07:37:29 - 1.8
@@ -23,8 +23,8 @@
##
# package version
-%define V_external 0.2.7
-%define V_internal b2353.g2360
+%define V_external 0.3.0
+%define V_internal b2405.g2407
# package information
Name: axl
@@ -37,7 +37,7 @@
Group:XML
License: LGPL
Version: %{V_external}
-Release: 20061109
+Release: 20061207
# list of sources
Source0:
http://switch.dl.sourceforge.net/vortexlibrary/axl-%{V_external}.%{V_internal}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-time/ perl-time.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Dec-2006 07:57:12
Branch: HEAD Handle: 2006120706571200
Modified files:
openpkg-src/perl-time perl-time.spec
Log:
modifying package: perl-time-5.8.8 20061206 -> 20061207
Summary:
RevisionChanges Path
1.140 +2 -2 openpkg-src/perl-time/perl-time.spec
patch -p0 <<'@@ .'
Index: openpkg-src/perl-time/perl-time.spec
$ cvs diff -u -r1.139 -r1.140 perl-time.spec
--- openpkg-src/perl-time/perl-time.spec 6 Dec 2006 06:54:47 -
1.139
+++ openpkg-src/perl-time/perl-time.spec 7 Dec 2006 06:57:12 -
1.140
@@ -25,7 +25,7 @@
# versions of individual parts
%define V_perl 5.8.8
%define V_time_date 1.16
-%define V_time_hires 1.9701
+%define V_time_hires 1.9702
%define V_time_local 1.13
%define V_date_manip 5.44
%define V_date_calc 5.4
@@ -48,7 +48,7 @@
Group:Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20061206
+Release: 20061207
# list of sources
Source0:
http://www.cpan.org/modules/by-module/Time/TimeDate-%{V_time_date}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/dhcpd/ dhcpd.conf dhcpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 19:07:47
Branch: HEAD Handle: 2006120618074600
Modified files:
openpkg-src/dhcpd dhcpd.conf dhcpd.spec
Log:
fix comment (I have a strong guess where to old IP comes from ;)
Summary:
RevisionChanges Path
1.5 +1 -1 openpkg-src/dhcpd/dhcpd.conf
1.95+1 -1 openpkg-src/dhcpd/dhcpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.conf
$ cvs diff -u -r1.4 -r1.5 dhcpd.conf
--- openpkg-src/dhcpd/dhcpd.conf 26 Jul 2003 19:13:55 - 1.4
+++ openpkg-src/dhcpd/dhcpd.conf 6 Dec 2006 18:07:46 - 1.5
@@ -62,7 +62,7 @@
# Provide full boot information for a FreeBSD diskless client "quux2":
# On the server, create a 32MB swapfile /dlc/fs/swap/swap.192.168.1.4
-# with `dd if=/dev/zero of=swap.141.1.129.4 bs=1m count=32' and the
+# with `dd if=/dev/zero of=swap.192.168.1.4 bs=1m count=32' and the
# filesystem /dlc/fs/quux2 with `cd /usr/src; make buildworld; make
# installworld DESTDIR=/dlc/fs/quux2'. Then use Etherboot for booting.
host quux2 {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
$ cvs diff -u -r1.94 -r1.95 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 6 Nov 2006 07:59:57 - 1.94
+++ openpkg-src/dhcpd/dhcpd.spec 6 Dec 2006 18:07:46 - 1.95
@@ -33,7 +33,7 @@
Group:DHCP
License: ISC/BSD
Version: 3.0.5
-Release: 20061106
+Release: 20061206
# package options
%option with_fsl yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch proftpd.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 18:51:08
Branch: HEAD Handle: 2006120617510800
Modified files:
openpkg-src/proftpd proftpd.patch proftpd.spec
Log:
upstream has taken over my patches
Summary:
RevisionChanges Path
1.19+0 -21 openpkg-src/proftpd/proftpd.patch
1.119 +1 -1 openpkg-src/proftpd/proftpd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.18 -r1.19 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 6 Dec 2006 08:07:43 - 1.18
+++ openpkg-src/proftpd/proftpd.patch 6 Dec 2006 17:51:08 - 1.19
@@ -1,24 +1,3 @@
-Index: mod_otp/mod_otp.c
mod_otp/mod_otp.c.orig 2002-10-31 02:16:23 +0100
-+++ mod_otp/mod_otp.c2005-11-07 21:15:19 +0100
-@@ -127,7 +127,7 @@
- ": error generating challenge for user '%s': %s", cmd->argv[1],
str);
-
- } else
--add_response(R_DUP, "Challenge: [ %s ]", challenge);
-+pr_response_add(R_DUP, "Challenge: [ %s ]", challenge);
-
- return DECLINED(cmd);
- }
-@@ -203,7 +203,7 @@
-
- static cmdtable otp_cmdtab[] = {
- { POST_CMD, C_USER, G_NONE, otp_post_user, FALSE, FALSE },
-- { NULL }
-+ { 0, NULL }
- };
-
- static authtable otp_authtab[] = {
Index: mod_sql_sqlite/mod_sql_sqlite.c
--- mod_sql_sqlite/mod_sql_sqlite.c.orig 2006-12-06 08:49:36 +0100
+++ mod_sql_sqlite/mod_sql_sqlite.c 2006-12-06 09:01:01 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.118 -r1.119 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 6 Dec 2006 07:47:40 - 1.118
+++ openpkg-src/proftpd/proftpd.spec 6 Dec 2006 17:51:08 - 1.119
@@ -25,7 +25,7 @@
# package version
%define V_proftpd 1.3.0a
%define V_mod_exec0.9
-%define V_mod_otp 0.9
+%define V_mod_otp 0.9.1
%define V_mod_shaper 0.6.2
%define V_mod_sql_sqlite 0.1
%define V_mod_sql_odbc0.3.1
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gnupg/ gnupg.patch gnupg.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 18:09:25
Branch: HEAD Handle: 2006120617092500
Modified files:
openpkg-src/gnupg gnupg.spec
Removed files:
openpkg-src/gnupg gnupg.patch
Log:
upgrading package: gnupg 1.4.5 -> 1.4.6
Summary:
RevisionChanges Path
1.9 +0 -16 openpkg-src/gnupg/gnupg.patch
1.69+2 -4 openpkg-src/gnupg/gnupg.spec
rm -f openpkg-src/gnupg/gnupg.patch <<'@@ .'
Index: openpkg-src/gnupg/gnupg.patch
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gnupg/gnupg.spec
$ cvs diff -u -r1.68 -r1.69 gnupg.spec
--- openpkg-src/gnupg/gnupg.spec 29 Nov 2006 08:16:33 - 1.68
+++ openpkg-src/gnupg/gnupg.spec 6 Dec 2006 17:09:25 - 1.69
@@ -32,8 +32,8 @@
Class:BASE
Group:PGP
License: GPL
-Version: 1.4.5
-Release: 20061129
+Version: 1.4.6
+Release: 20061206
# package options
%option with_curl no
@@ -43,7 +43,6 @@
# list of sources
Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.gz
Source1: ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz
-Patch0: gnupg.patch
# build information
Prefix: %{l_prefix}
@@ -80,7 +79,6 @@
%prep
%setup -q
-%patch -p0
%if "%{with_idea}" == "yes"
%{l_gzip} -d -c %{SOURCE idea.c.gz} >cipher/idea.c
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/dhtml/ dhtml.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 17:43:31
Branch: HEAD Handle: 2006120616433100
Modified files:
openpkg-src/dhtml dhtml.spec
Log:
modifying package: dhtml-20060816 20061114 -> 20061206
Summary:
RevisionChanges Path
1.69+2 -2 openpkg-src/dhtml/dhtml.spec
patch -p0 <<'@@ .'
Index: openpkg-src/dhtml/dhtml.spec
$ cvs diff -u -r1.68 -r1.69 dhtml.spec
--- openpkg-src/dhtml/dhtml.spec 14 Nov 2006 07:33:33 - 1.68
+++ openpkg-src/dhtml/dhtml.spec 6 Dec 2006 16:43:31 - 1.69
@@ -59,7 +59,7 @@
%define V_cssquery 2.0.2
%define V_ajaxslt 0.4
%define V_spry P1_2_07-13
-%define V_dojo 0.4.0
+%define V_dojo 0.4.1
%define V_mochikit 1.3.1
%define V_ffjs 1.1
%define V_dwt 0.2
@@ -75,7 +75,7 @@
Group:HTML
License: Open Source
Version: %{V_dhtml}
-Release: 20061114
+Release: 20061206
# list of sources
Source0: http://prototype.conio.net/dist/prototype-%{V_prototype}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/urpmi/ urpmi.patch urpmi.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 17:43:16
Branch: HEAD Handle: 2006120616431600
Modified files:
openpkg-src/urpmi urpmi.patch urpmi.spec
Log:
upgrading package: urpmi 4.9.6 -> 4.9.8
Summary:
RevisionChanges Path
1.20+6 -6 openpkg-src/urpmi/urpmi.patch
1.28+3 -3 openpkg-src/urpmi/urpmi.spec
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.patch
$ cvs diff -u -r1.19 -r1.20 urpmi.patch
--- openpkg-src/urpmi/urpmi.patch 4 Dec 2006 16:38:38 - 1.19
+++ openpkg-src/urpmi/urpmi.patch 6 Dec 2006 16:43:16 - 1.20
@@ -135,9 +135,9 @@
#include
#define FILENAME_TAG 100
-Index: urpmi-4.9.6/Makefile.PL
urpmi-4.9.6/Makefile.PL.orig 2006-11-17 18:51:28 +0100
-+++ urpmi-4.9.6/Makefile.PL 2006-11-25 20:25:08 +0100
+Index: urpmi-4.9.8/Makefile.PL
+--- urpmi-4.9.8/Makefile.PL.orig 2006-11-17 18:51:28 +0100
urpmi-4.9.8/Makefile.PL 2006-11-25 20:25:08 +0100
@@ -60,6 +60,7 @@
my $po = $with_po ? ' installpo' : '';
my $gui = $with_gui ? ' installgurpmi2' : '';
@@ -172,9 +172,9 @@
},
EXE_FILES => [ @bin_scripts, @sbin_scripts ],
PMLIBDIRS => [ qw(urpm) ],
-Index: urpmi-4.9.6/urpm/sys.pm
urpmi-4.9.6/urpm/sys.pm.orig 2006-11-23 11:51:16 +0100
-+++ urpmi-4.9.6/urpm/sys.pm 2006-11-25 20:26:24 +0100
+Index: urpmi-4.9.8/urpm/sys.pm
+--- urpmi-4.9.8/urpm/sys.pm.orig 2006-11-23 11:51:16 +0100
urpmi-4.9.8/urpm/sys.pm 2006-11-25 20:26:24 +0100
@@ -94,7 +94,7 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
$ cvs diff -u -r1.27 -r1.28 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 4 Dec 2006 16:38:38 - 1.27
+++ openpkg-src/urpmi/urpmi.spec 6 Dec 2006 16:43:16 - 1.28
@@ -23,8 +23,8 @@
##
# package version
-%define V_urpmi 4.9.6
-%define V_urpmi_rpm 4.9.6-1mdv2007.1
+%define V_urpmi 4.9.8
+%define V_urpmi_rpm 4.9.8-1mdv2007.1
%define V_urpm1.52
%define V_urpm_rpm1.52-1mdv2007.1
%define V_mdv_distribconf 3.06
@@ -45,7 +45,7 @@
Group:Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20061204
+Release: 20061206
# package options
%option with_wget no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY bash.patch
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 13:57:02
Branch: HEAD Handle: 2006120612570100
Modified files:
openpkg-src/openpkg HISTORY bash.patch
Log:
apply the GNU Bash 3.2 upstream patches 001-005
Summary:
RevisionChanges Path
1.407 +2 -0 openpkg-src/openpkg/HISTORY
1.12+254 -6 openpkg-src/openpkg/bash.patch
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.406 -r1.407 HISTORY
--- openpkg-src/openpkg/HISTORY 6 Dec 2006 11:22:20 - 1.406
+++ openpkg-src/openpkg/HISTORY 6 Dec 2006 12:57:01 - 1.407
@@ -2,6 +2,8 @@
2006
+20061206 RELEASE AS PART OF OPENPKG 2.20061206 ***
+20061206 apply the GNU Bash 3.2 upstream patches 001-005
20061206 switch GNU gzip from pre-patched OpenPKG tarball to pristine
upstream tarball plus OpenPKG "update" tarball
20061206 enhance "openpkg release" robustness when config file defines same
value repeatedly
20061205 skip build of irrelevant parts of the GNU tar distribution
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/bash.patch
$ cvs diff -u -r1.11 -r1.12 bash.patch
--- openpkg-src/openpkg/bash.patch11 Oct 2006 16:11:48 - 1.11
+++ openpkg-src/openpkg/bash.patch6 Dec 2006 12:57:01 - 1.12
@@ -74,18 +74,266 @@
-
-Accumulated vendor patches Bash 3.2 001-XXX
+Accumulated vendor patches Bash 3.2 001-005
+
Generated via:
-$ cat bash32-* | patch -p0 -Vt -b
+$ gunzip ftp://ftp.gnu.org/gnu/bison/bison-1.28.tar.gz
+$ cd bison-1.28
+$ ./configure --prefix=/tmp/bison
+$ make
+$ make install
+$ popd
$ mv y.tab.c y.tab.c.orig
$ mv y.tab.h y.tab.h.orig
$ /tmp/bison/bin/bison -y -d parse.y
+$ rm -rf /tmp/bison /tmp/bison-1.28 /tmp/bison-1.28.tar.gz
$ shtool subst -b.dummy \
- -e 's;parse\.y;/usr/src/local/chet/src/bash/src/parse.y;g' \
+ -e 's;parse\.y;/Users/chet/src/bash/src/parse.y;g' \
-e 's;/tmp/bison/share/bison\.simple;/usr/share/bison.simple;g' y.tab.c
-$ svs diff
-
-[CURRENTLY NONE]
+$ svs diff >/tmp/bash.patch
+$ popd
+$ rm -rf bash-3.2
+Index: parse.y
+--- parse.y.orig 2006-09-19 22:37:21 +0200
parse.y 2006-12-06 13:32:45 +0100
+@@ -1029,6 +1029,7 @@
+ #define PST_CMDTOKEN0x1000 /* command token OK - unused */
+ #define PST_COMPASSIGN 0x2000 /* parsing x=(...) compound
assignment */
+ #define PST_ASSIGNOK0x4000 /* assignment statement ok in
this context */
++#define PST_REGEXP 0x8000 /* parsing an ERE/BRE as a single word
*/
+
+ /* Initial size to allocate for tokens, and the
+amount to grow them by. */
+@@ -2591,6 +2592,9 @@
+ return (character);
+ }
+
++ if (parser_state & PST_REGEXP)
++goto tokword;
++
+ /* Shell meta-characters. */
+ if MBTEST(shellmeta (character) && ((parser_state & PST_DBLPAREN) == 0))
+ {
+@@ -2698,6 +2702,7 @@
+ if MBTEST(character == '-' && (last_read_token == LESS_AND ||
last_read_token == GREATER_AND))
+ return (character);
+
++tokword:
+ /* Okay, if we got this far, we have to read a word. Read one,
+ and then check it against the known ones. */
+ result = read_token_word (character);
+@@ -2735,7 +2740,7 @@
+ /* itrace("parse_matched_pair: open = %c close = %c", open, close); */
+ count = 1;
+ pass_next_character = backq_backslash = was_dollar = in_comment = 0;
+- check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags
& P_DQUOTE) == 0;
++ check_comment = (flags & P_COMMAND) && qc != '`' && qc != '\'' && qc !=
'"' && (flags & P_DQUOTE) == 0;
+
+ /* RFLAGS is the set of flags we want to pass to recursive calls. */
+ rflags = (qc == '"') ? P_DQUOTE : (flags & P_DQUOTE);
+@@ -3202,8 +3207,11 @@
+ if (tok == WORD && test_binop (yylval.word->word))
+ op = yylval.word;
+ #if defined (COND_REGEXP)
+-
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 12:22:20
Branch: HEAD Handle: 2006120611222000
Modified files:
openpkg-src/openpkg HISTORY
Log:
fix typo
Summary:
RevisionChanges Path
1.406 +1 -1 openpkg-src/openpkg/HISTORY
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.405 -r1.406 HISTORY
--- openpkg-src/openpkg/HISTORY 6 Dec 2006 11:19:25 - 1.405
+++ openpkg-src/openpkg/HISTORY 6 Dec 2006 11:22:20 - 1.406
@@ -6,7 +6,7 @@
20061206 enhance "openpkg release" robustness when config file defines same
value repeatedly
20061205 skip build of irrelevant parts of the GNU tar distribution
20061129 upgrade to GNU gzip 1.3.6
-20061129 ajust wordings in package class hints according to current
classification
+20061129 adjust wordings in package class hints according to current
classification
20061114 upgrade to openpkg-tools 1.1.1
20061114 provide %{l_miniperl} and %{l_openssl} macros
20061112 install zlib's zconf.h header as it is required by zlib.h
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 12:19:25
Branch: HEAD Handle: 2006120611192500
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
switch GNU gzip from pre-patched OpenPKG tarball to pristine upstream
tarball plus OpenPKG "update" tarball
Summary:
RevisionChanges Path
1.405 +1 -0 openpkg-src/openpkg/HISTORY
1.551 +82 -73 openpkg-src/openpkg/openpkg.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.404 -r1.405 HISTORY
--- openpkg-src/openpkg/HISTORY 6 Dec 2006 09:11:24 - 1.404
+++ openpkg-src/openpkg/HISTORY 6 Dec 2006 11:19:25 - 1.405
@@ -2,6 +2,7 @@
2006
+20061206 switch GNU gzip from pre-patched OpenPKG tarball to pristine
upstream tarball plus OpenPKG "update" tarball
20061206 enhance "openpkg release" robustness when config file defines same
value repeatedly
20061205 skip build of irrelevant parts of the GNU tar distribution
20061129 upgrade to GNU gzip 1.3.6
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.550 -r1.551 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 6 Dec 2006 09:11:24 - 1.550
+++ openpkg-src/openpkg/openpkg.spec 6 Dec 2006 11:19:25 - 1.551
@@ -49,6 +49,7 @@
%define V_curl 7.16.0
%define V_make 3.81
%define V_gzip 1.3.6
+%define V_gzip_r 1.7
%define V_patch2.5.9
%define V_tar 1.16
%define V_bash 3.2
@@ -75,78 +76,79 @@
# list of sources
Source0: ftp://ftp.openpkg.org/sources/CPY/openpkg/rpm-%{V_rpm}.tar.gz
Source1: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{V_uuid}.tar.gz
-Source2:
ftp://ftp.openpkg.org/sources/CPY/openpkg/gzip-%{V_gzip}-openpkg.tar
-Source3: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
-Source4: ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz
-Source5: ftp://ftp.cwru.edu/pub/bash/bash-%{V_bash}.tar.gz
-Source6:
ftp://ftp.openpkg.org/sources/CPY/config/config-%{V_config}.tar.gz
-Source7: ftp://ftp.gnu.org/gnu/make/make-%{V_make}.tar.gz
-Source8: http://www.bzip.org/%{V_bzip2}/bzip2-%{V_bzip2}.tar.gz
-Source9: http://curl.haxx.se/download/curl-%{V_curl}.tar.gz
-Source10:
http://switch.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
-Source11: http://www.zlib.net/zlib-%{V_zlib}.tar.gz
-Source12:
ftp://ftp.openpkg.org/sources/CPY/openpkg-registry/openpkg-registry-%{V_registry}.tar.gz
-Source13:
ftp://ftp.openpkg.org/sources/CPY/openpkg-tools/openpkg-tools-%{V_tools}.tar.gz
-Source14:
ftp://ftp.openpkg.org/sources/CPY/perl/perl-%{V_perl}-mini.tar.gz
-Source15: ftp://ftp.openssl.org/source/openssl-%{V_openssl}.tar.gz
-Source16: HISTORY
-Source17: README
-Source18: aux.prereq.sh
-Source19: aux.usrgrp.sh
-Source20: aux.wrapbin.sh
-Source21: aux.wrapsrc.sh
-Source22: bash.patch
-Source23: beecrypt.patch
-Source24: dot.bash_login
-Source25: dot.bashrc
-Source26: dot.lsyncrc
-Source27: install.sh
-Source28: local.README
-Source29: lsync
-Source30: lsync.8
-Source31: lsync.pod
-Source32: make.patch
-Source33: man.sh
-Source34: openpkg.1
-Source35: openpkg.boot
-Source36: openpkg.c
-Source37: openpkg.com.pgp
-Source38: openpkg.net.pgp
-Source39: openpkg.org.pgp
-Source40: openpkg.pod
-Source41: openpkg.sh
-Source42: openssl.patch
-Source43: perl.patch
-Source44: pod2man.sh
-Source45: rc
-Source46: rc.8
-Source47: rc.conf
-Source48: rc.func
-Source49: rc.openpkg
-Source50: rc.pod
-Source51: release.8
-Source52: release.pod
-Source53: release.sh
-Source54: root.README
-Source55: rpm-config.8
-Source56: rpm-config.pod
-Source57: rpm-config.sh
-Source58: rpm.patch.bugfix
-Source59: rpm.patch.feature
-Source60: rpm.patch.porting
-Source61: rpm.patch.regen
-Source62: rpmdb
-Source63: rpmmacros
-Source64: rpmpopt
-Source65: rpmrc
-Source66: rpmtool
-Source67: rpmtool.8
-Source68: rpmtool.pod
[CVS] OpenPKG: openpkg-src/gzip/ gzip.patch gzip.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 12:04:06
Branch: HEAD Handle: 2006120611040500
Modified files:
openpkg-src/gzipgzip.patch gzip.spec
Log:
fix offset in patch to avoid fuzz matching
Summary:
RevisionChanges Path
1.7 +3 -3 openpkg-src/gzip/gzip.patch
1.42+1 -1 openpkg-src/gzip/gzip.spec
patch -p0 <<'@@ .'
Index: openpkg-src/gzip/gzip.patch
$ cvs diff -u -r1.6 -r1.7 gzip.patch
--- openpkg-src/gzip/gzip.patch 23 Nov 2006 17:15:40 - 1.6
+++ openpkg-src/gzip/gzip.patch 6 Dec 2006 11:04:05 - 1.7
@@ -1,9 +1,9 @@
Security Fix
Index: gzip.c
gzip.c.orig 2005-06-11 10:02:57 +0200
-+++ gzip.c 2005-06-11 10:03:02 +0200
-@@ -205,7 +236,7 @@
+--- gzip.c.orig 2006-11-20 09:40:33 +0100
gzip.c 2006-12-06 12:02:25 +0100
+@@ -167,7 +167,7 @@
DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA);
DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA);
DECLARE(ush, d_buf, DIST_BUFSIZE);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gzip/gzip.spec
$ cvs diff -u -r1.41 -r1.42 gzip.spec
--- openpkg-src/gzip/gzip.spec23 Nov 2006 17:15:40 - 1.41
+++ openpkg-src/gzip/gzip.spec6 Dec 2006 11:04:05 - 1.42
@@ -33,7 +33,7 @@
Group:Compression
License: GPL
Version: 1.3.6
-Release: 20061123
+Release: 20061206
# list of sources
Source0: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ release.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 10:46:16
Branch: HEAD Handle: 2006120609461500
Modified files:
openpkg-src/openpkg release.sh
Log:
be maximum portable and consistently use '-e' option for sed(1)
expressions; use our usual style and place pipe at end of line
Summary:
RevisionChanges Path
1.4 +4 -4 openpkg-src/openpkg/release.sh
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/release.sh
$ cvs diff -u -r1.3 -r1.4 release.sh
--- openpkg-src/openpkg/release.sh6 Dec 2006 09:11:25 - 1.3
+++ openpkg-src/openpkg/release.sh6 Dec 2006 09:46:15 - 1.4
@@ -74,8 +74,8 @@
tag=`(cat $prefix/etc/openpkg/release; echo "") | sed \
-e 's;^;X;' \
-e 's;^X *TAG *= *\([^ ][^ ]*\).*;\1;' \
--e '/^X/d' \
-| sed -n '$p'`
+-e '/^X/d' | \
+sed -n -e '$p'`
else
tag=`$prefix/bin/openpkg rpm \
-q --qf '%{VERSION}\n' openpkg | number_to_tag`
@@ -91,8 +91,8 @@
url=`(cat $prefix/etc/openpkg/release; echo "") | sed \
-e 's;^;X;' \
-e 's;^X *URL *= *\([^ ][^ ]*\).*;\1;' \
--e '/^X/d' \
-| sed -n '$p'`
+-e '/^X/d' | \
+sed -n -e '$p'`
fi
if [ ".$url" = . ]; then
url="ftp://ftp.openpkg.org/*";
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/md5sha1sum/ md5sha1sum.patch md5sha1sum.spe...
HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package information
+Name: md5sha1sum
+Summary: MD5/SHA1/RIPEMD160 File Checksum Utilities
+URL: http://www.microbrew.org/tools/md5sha1sum/
+Vendor: Bulent Yilmaz
+Packager: OpenPKG Foundation e.V.
+Distribution: OpenPKG Community
+Class:EVAL
+Group:Filesystem
+License: GPL
+Version: 0.9.4
+Release: 20061206
+
+# list of sources
+Source0:
http://www.microbrew.org/tools/md5sha1sum/md5sha1sum-%{version}.tar.gz
+Patch0: md5sha1sum.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot:%{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20040130
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: openssl
+PreReq: openssl
+AutoReq: no
+AutoReqProv: no
+
+%description
+This toolset provides the md5sum(1), sha1sum(1) and ripemd160sum(1)
+utilities for generating the MD5/SHA1/RIPEMD160 message digest based
+checksums for files.
+
+%track
+prog md5sha1sum = {
+version = %{version}
+url = http://www.microbrew.org/tools/md5sha1sum/
+regex = md5sha1sum-(__VER__)\.tar\.gz
+}
+
+%prep
+%setup -q
+%patch -p0
+
+%build
+CC="%{l_cc}" \
+CFLAGS="%{l_cflags -O} %{l_cppflags}" \
+LDFLAGS="%{l_ldflags}" \
+SSLINCPATH="%{l_prefix}/include" \
+SSLLIBPATH="%{l_prefix}/lib" \
+./configure \
+--prefix=%{l_prefix}
+%{l_make} %{l_mflags -O}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{l_shtool} mkdir -f -p -m 755 \
+$RPM_BUILD_ROOT%{l_prefix}/bin
+%{l_shtool} install -c -s -m 755 \
+md5sum $RPM_BUILD_ROOT%{l_prefix}/bin/
+%{l_shtool} mkln \
+$RPM_BUILD_ROOT%{l_prefix}/bin/md5sum \
+$RPM_BUILD_ROOT%{l_prefix}/bin/sha1sum
+%{l_shtool} mkln \
+$RPM_BUILD_ROOT%{l_prefix}/bin/md5sum \
+$RPM_BUILD_ROOT%{l_prefix}/bin/ripemd160sum
+%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+%files -f files
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec release.sh
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: 06-Dec-2006 10:11:25
Branch: HEAD Handle: 2006120609112401
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec release.sh
Log:
enhance "openpkg release" robustness when config file defines same
value repeatedly (fixes problems where calls to rpm print error
messages like "sed: -e expression ... unterminated ... command")
Summary:
RevisionChanges Path
1.404 +1 -0 openpkg-src/openpkg/HISTORY
1.550 +1 -1 openpkg-src/openpkg/openpkg.spec
1.3 +4 -2 openpkg-src/openpkg/release.sh
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.403 -r1.404 HISTORY
--- openpkg-src/openpkg/HISTORY 5 Dec 2006 12:27:45 - 1.403
+++ openpkg-src/openpkg/HISTORY 6 Dec 2006 09:11:24 - 1.404
@@ -2,6 +2,7 @@
2006
+20061206 enhance "openpkg release" robustness when config file defines same
value repeatedly
20061205 skip build of irrelevant parts of the GNU tar distribution
20061129 upgrade to GNU gzip 1.3.6
20061129 ajust wordings in package class hints according to current
classification
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.549 -r1.550 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Dec 2006 12:27:45 - 1.549
+++ openpkg-src/openpkg/openpkg.spec 6 Dec 2006 09:11:24 - 1.550
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20061205
+%define V_openpkg 20061206
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/release.sh
$ cvs diff -u -r1.2 -r1.3 release.sh
--- openpkg-src/openpkg/release.sh23 Aug 2006 06:54:43 - 1.2
+++ openpkg-src/openpkg/release.sh6 Dec 2006 09:11:25 - 1.3
@@ -74,7 +74,8 @@
tag=`(cat $prefix/etc/openpkg/release; echo "") | sed \
-e 's;^;X;' \
-e 's;^X *TAG *= *\([^ ][^ ]*\).*;\1;' \
--e '/^X/d'`
+-e '/^X/d' \
+| sed -n '$p'`
else
tag=`$prefix/bin/openpkg rpm \
-q --qf '%{VERSION}\n' openpkg | number_to_tag`
@@ -90,7 +91,8 @@
url=`(cat $prefix/etc/openpkg/release; echo "") | sed \
-e 's;^;X;' \
-e 's;^X *URL *= *\([^ ][^ ]*\).*;\1;' \
--e '/^X/d'`
+-e '/^X/d' \
+| sed -n '$p'`
fi
if [ ".$url" = . ]; then
url="ftp://ftp.openpkg.org/*";
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.patch
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 09:07:44
Branch: HEAD Handle: 2006120608074300
Modified files:
openpkg-src/proftpd proftpd.patch
Log:
try to convert the mod_sql_sqlite modules from the ancient SQLite v2
API to the current v3 API so the module finally uses SQLite 3.x
Summary:
RevisionChanges Path
1.18+170 -0 openpkg-src/proftpd/proftpd.patch
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.patch
$ cvs diff -u -r1.17 -r1.18 proftpd.patch
--- openpkg-src/proftpd/proftpd.patch 6 Dec 2006 07:03:13 - 1.17
+++ openpkg-src/proftpd/proftpd.patch 6 Dec 2006 08:07:43 - 1.18
@@ -19,6 +19,176 @@
};
static authtable otp_authtab[] = {
+Index: mod_sql_sqlite/mod_sql_sqlite.c
+--- mod_sql_sqlite/mod_sql_sqlite.c.orig 2006-12-06 08:49:36 +0100
mod_sql_sqlite/mod_sql_sqlite.c 2006-12-06 09:01:01 +0100
+@@ -22,15 +22,15 @@
+ * the source code for OpenSSL in the source distribution.
+ *
+ * $Id: proftpd.patch,v 1.18 2006/12/06 08:07:43 rse Exp $
+- * $Libraries: -lsqlite $
++ * $Libraries: -lsqlite3 $
+ */
+
+-#include
++#include
+
+ #include "conf.h"
+ #include "mod_sql.h"
+
+-#define MOD_SQL_SQLITE_VERSION "mod_sql_sqlite/0.1"
++#define MOD_SQL_SQLITE_VERSION "mod_sql_sqlite/0.1+"
+
+ /* Make sure the version of proftpd is as necessary. */
+ #if PROFTPD_VERSION_NUMBER < 0x0001021101
+@@ -44,7 +44,7 @@
+ char *user;
+ char *pass;
+
+- sqlite *dbh;
++ sqlite3 *dbh;
+
+ } db_conn_t;
+
+@@ -185,7 +185,6 @@
+ }
+
+ MODRET sql_sqlite_open(cmd_rec *cmd) {
+- char *tmp = NULL;
+ conn_entry_t *entry = NULL;
+ db_conn_t *conn = NULL;
+
+@@ -220,21 +219,17 @@
+ return HANDLED(cmd);
+ }
+
+- conn->dbh = sqlite_open(conn->dsn, 0, &tmp);
+- if (conn->dbh == NULL) {
+-char *errstr = pstrdup(cmd->pool, tmp);
+-sqlite_freemem(tmp);
++ if (sqlite3_open(conn->dsn, &conn->dbh) != SQLITE_OK) {
++char *errstr = pstrdup(cmd->pool, sqlite3_errmsg(conn->dbh));
++sqlite3_close(conn->dbh);
+
+ sql_log(DEBUG_FUNC, "%s", "exiting \tsqlite cmd_open");
+ return ERROR_MSG(cmd, MOD_SQL_SQLITE_VERSION, errstr);
+ }
+
+- if (tmp)
+-sqlite_freemem(tmp);
+-
+ /* Add some SQLite information to the logs. */
+ sql_log(DEBUG_INFO, MOD_SQL_SQLITE_VERSION ": SQLite version: %s",
+-sqlite_libversion());
++sqlite3_libversion());
+
+ entry->nconn++;
+
+@@ -295,7 +290,7 @@
+ (cmd->argc == 2 && cmd->argv[1])) {
+
+ if (conn->dbh) {
+- sqlite_close(conn->dbh);
++ sqlite3_close(conn->dbh);
+ conn->dbh = NULL;
+ }
+
+@@ -447,9 +442,9 @@
+ /* Perform the query. If it doesn't work, log the error, close the
+* connection, then return the error from the query processing.
+*/
+- if (sqlite_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
++ if (sqlite3_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
+ char *errstr = pstrdup(cmd->pool, tmp);
+-sqlite_freemem(tmp);
++sqlite3_free(tmp);
+
+ close_cmd = pr_cmd_alloc(cmd->tmp_pool, 1, entry->name);
+ sql_sqlite_close(close_cmd);
+@@ -460,7 +455,7 @@
+ }
+
+ if (tmp)
+-sqlite_freemem(tmp);
++sqlite3_free(tmp);
+
+ mr = sql_sqlite_get_data(cmd);
+
+@@ -517,9 +512,9 @@
+* connection (and log any errors there, too) then return the error
+* from the query processing.
+*/
+- if (sqlite_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
++ if (sqlite3_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
+ char *errstr = pstrdup(cmd->pool, tmp);
+-sqlite_freemem(tmp);
++sqlite3_free(tmp);
+
+ close_cmd = pr_cmd_alloc(cmd->tmp_pool, 1, entry->name);
+ sql_sqlite_close(close_cmd);
+@@ -530,7 +525,7 @@
+ }
+
+ if (tmp)
+-sqlite_freemem(tmp);
++sqlite3_free(tmp);
+
+ /* Reset these variables. The memory in them is allocated from this
+* same cmd_rec, and will be recovered when the cmd_rec is destroyed.
+@@ -594,9 +589,9 @@
+ /* Perform the query. If it doesn't work close the connection, then
+* return the error from the query processing.
+*/
+- if (sqlite_exec(conn->dbh, query, exec_cb, cmd, &tmp) != SQLITE_OK) {
++ if (
