Bug#776987: nmu patch
apologies, the previous patch didn't apply cleanly.
I'm attaching a new one, against the sqlcipher git repo.
I think this is ready for nmu, if we're still on time.
From 675ede1eff7d271d82695ff2598b4af28399c330 Mon Sep 17 00:00:00 2001
From: Ben Carrillo b...@futeisha.org
Date: Wed, 22 Apr 2015 10:15:04 -0400
Subject: [PATCH] Add a different variable for SQLCIPHER version
Closes: #776987
The version substitution of the patch 20-change-name-to-sqlcipher was
breaking code that relied on the base sqlite library versioning, since
this version is made public in the library and some extensions do a
hardcoded version check that expects the right sqlite version, instead
of the sqlcipher one.
This patch changes the behavior of the mentioned debian patch, and
allows to version the sqlcipher library number separately (used when
configuring the library symbols in the system).
---
debian/changelog | 8 +
debian/patches/20-change-name-to-sqlcipher.patch | 43
debian/patches/32-fix-pkgconfig-libname.patch| 2 +-
3 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eca50f3..ce265e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sqlcipher (3.2.0-1.1) unstable; urgency=medium
+
+ [ Ben Carrillo ]
+ * Non-maintainer upload.
+ * use a separate variable to track SQLCIPHER version (Closes: #776987)
+
+ -- Micah Anderson mi...@debian.org Wed, 22 Apr 2015 10:38:05 -0400
+
sqlcipher (3.2.0-1) unstable; urgency=low
* updated to latest upstream: v3.2.0
diff --git a/debian/patches/20-change-name-to-sqlcipher.patch b/debian/patches/20-change-name-to-sqlcipher.patch
index 4d02dda..64b10c9 100644
--- a/debian/patches/20-change-name-to-sqlcipher.patch
+++ b/debian/patches/20-change-name-to-sqlcipher.patch
@@ -1,7 +1,38 @@
a/VERSION
-+++ b/VERSION
-@@ -1 +1 @@
--3.8.6
-\ No newline at end of file
+--- a/Makefile.in
b/Makefile.in
+@@ -89,6 +89,7 @@ TCC += $(OPTS)
+ VERSION = @VERSION@
+ VERSION_NUMBER = @VERSION_NUMBER@
+ RELEASE = @RELEASE@
++SQLCIPHER_VERSION = @SQLCIPHER_VERSION@
+
+ # Filename extensions
+ #
+--- /dev/null
b/VERSION_SQLCIPHER
+@@ -0,0 +1 @@
+3.2.0
-\ No newline at end of file
+--- a/configure.ac
b/configure.ac
+@@ -179,6 +179,10 @@ VERSION_NUMBER=[`cat $srcdir/VERSION \
+ AC_MSG_NOTICE(Version number set to $VERSION_NUMBER)
+ AC_SUBST(VERSION_NUMBER)
+
++SQLCIPHER_VERSION=[`cat $srcdir/VERSION_SQLCIPHER | sed 's/^\([0-9]*\.*[0-9]*\).*/\1/'`]
++AC_MSG_NOTICE(SQLCipher Version set to $SQLCIPHER_VERSION)
++AC_SUBST(SQLCIPHER_VERSION)
++
+ #
+ # Check to see if the --with-hints=FILE option is used. If there is none,
+ # then check for a files named $host.hints and ../$hosts.hints where
+--- a/sqlcipher.pc.in
b/sqlcipher.pc.in
+@@ -7,7 +7,7 @@ includedir=@includedir@
+
+ Name: SQLCipher
+ Description: SQL database engine
+-Version: @PACKAGE_VERSION@
++Version: @SQLCIPHER_VERSION@
+ Libs: -L${libdir} -lsqlcipher
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
diff --git a/debian/patches/32-fix-pkgconfig-libname.patch b/debian/patches/32-fix-pkgconfig-libname.patch
index 5a9a920..44c8dfb 100644
--- a/debian/patches/32-fix-pkgconfig-libname.patch
+++ b/debian/patches/32-fix-pkgconfig-libname.patch
@@ -1,7 +1,7 @@
--- a/sqlcipher.pc.in
+++ b/sqlcipher.pc.in
@@ -10,4 +10,4 @@ Description: SQL database engine
- Version: @PACKAGE_VERSION@
+ Version: @SQLCIPHER_VERSION@
Libs: -L${libdir} -lsqlcipher
Libs.private: @LIBS@
-Cflags: -I${includedir}
--
2.1.4
Bug#776987: version string in libsqlcipher
On Thu, Apr 16, 2015 at 11:32:10AM -0400, Hans-Christoph Steiner transmogrified
1.4K bytes...
I did just think of one last thing to check: the SO versioning of the library
file, i.e. libsqlcipher.so
Also, the public representation of the SQLCipher version, like in
sqlcipher.pc, version the SQLite3 version.
thanks for the info hans
I believe the attached patch would be addressing these issues.
can you have a look and comment if something's missing?
maybe we should ask to re-include libsqlcipher0 in testing after this
fix?
diff -rupN ../../../tmp/sqlcipher-3.2.0/debian/patches/20-change-name-to-sqlcipher.patch patches/20-change-name-to-sqlcipher.patch
--- ../../../tmp/sqlcipher-3.2.0/debian/patches/20-change-name-to-sqlcipher.patch 2014-10-16 23:24:01.0 -0400
+++ patches/20-change-name-to-sqlcipher.patch 2015-04-17 00:21:21.808599690 -0400
@@ -1,7 +1,70 @@
a/VERSION
-+++ b/VERSION
-@@ -1 +1 @@
--3.8.6
-\ No newline at end of file
+--- /dev/null
b/VERSION_SQLCIPHER
+@@ -0,0 +1 @@
+3.2.0
-\ No newline at end of file
+--- a/sqlcipher.pc.in
b/sqlcipher.pc.in
+@@ -7,7 +7,7 @@ includedir=@includedir@
+
+ Name: SQLCipher
+ Description: SQL database engine
+-Version: @PACKAGE_VERSION@
++Version: @SQLCIPHER_VERSION@
+ Libs: -L${libdir} -lsqlcipher
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
+--- a/src/tclsqlite.c
b/src/tclsqlite.c
+@@ -3080,6 +3080,10 @@ static int DbMain(void *cd, Tcl_Interp *
+ # define PACKAGE_VERSION SQLITE_VERSION
+ #endif
+
++#ifndef SQLCIPHER_PACKAGE_VERSION
++# define SQLCIPHER_PACKAGE_VERSION SQLCIPHER_VERSION
++#endif
++
+ /*
+ ** Initialize this module.
+ **
+--- a/Makefile.in
b/Makefile.in
+@@ -90,6 +90,8 @@ VERSION = @VERSION@
+ VERSION_NUMBER = @VERSION_NUMBER@
+ RELEASE = @RELEASE@
+
++SQLCIPHER_VERSION = @SQLCIPHER_VERSION@
++
+ # Filename extensions
+ #
+ BEXE = @BUILD_EXEEXT@
+--- a/autoconf/tea/Makefile.in
b/autoconf/tea/Makefile.in
+@@ -93,6 +93,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
++SQLCIPHER_PACKAGE_VERSION = @SQLCIPHER_PACKAGE_VERSION@
+ CC = @CC@
+ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
+ CFLAGS_WARNING = @CFLAGS_WARNING@
+--- a/configure.ac
b/configure.ac
+@@ -89,6 +89,7 @@
+ #
+ AC_INIT(sqlcipher, m4_esyscmd([cat VERSION | tr -d '\n']))
+
++
+ dnl Make sure the local VERSION file matches this configure script
+ sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'`
+ if test $PACKAGE_VERSION != $sqlite_version_sanity_check ; then
+@@ -179,6 +180,10 @@ VERSION_NUMBER=[`cat $srcdir/VERSION \
+ AC_MSG_NOTICE(Version number set to $VERSION_NUMBER)
+ AC_SUBST(VERSION_NUMBER)
+
++SQLCIPHER_VERSION=[`cat $srcdir/VERSION_SQLCIPHER | sed 's/^\([0-9]*\.*[0-9]*\).*/\1/'`]
++AC_MSG_NOTICE(SQLCipher Version set to $SQLCIPHER_VERSION)
++AC_SUBST(SQLCIPHER_VERSION)
++
+ #
+ # Check to see if the --with-hints=FILE option is used. If there is none,
+ # then check for a files named $host.hints and ../$hosts.hints where
diff -rupN ../../../tmp/sqlcipher-3.2.0/debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch
--- ../../../tmp/sqlcipher-3.2.0/debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch 2014-10-16 23:10:08.0 -0400
+++ patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch 2015-04-16 23:53:25.700288317 -0400
@@ -10,8 +10,8 @@ Bug-Debian: http://bugs.debian.org/67257
Forwarded: not-needed
Last-Update: 2012-05-16
sqlite3-3.7.12.orig/src/sqliteLimit.h
-+++ sqlite3-3.7.12/src/sqliteLimit.h
+--- a/src/sqliteLimit.h
b/src/sqliteLimit.h
@@ -169,7 +169,7 @@
** SQLite will choose on its own.
*/
diff -rupN ../../../tmp/sqlcipher-3.2.0/debian/patches/32-fix-pkgconfig-libname.patch patches/32-fix-pkgconfig-libname.patch
--- ../../../tmp/sqlcipher-3.2.0/debian/patches/32-fix-pkgconfig-libname.patch 2014-10-16 23:25:32.0 -0400
+++ patches/32-fix-pkgconfig-libname.patch 2015-04-17 00:24:08.973428615 -0400
@@ -1,7 +1,7 @@
--- a/sqlcipher.pc.in
+++ b/sqlcipher.pc.in
@@ -10,4 +10,4 @@ Description: SQL database engine
- Version: @PACKAGE_VERSION@
+ Version: @SQLCIPHER_VERSION@
Libs: -L${libdir} -lsqlcipher
Libs.private: @LIBS@
-Cflags: -I${includedir}
Bug#776987: severity change for 776987
severity 776987 serious thanks raising severity after conversation with maintainer. this potentially affects all code with functionality depending on the right sqlite version. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#776987: libsqlcipher0: change in VERSION affects code depending on SQLITE_VERSION_NUMBER
Package: libsqlcipher0 Version: 3.2.0-1 Severity: important Dear Maintainer, While debugging an error with pysqlcipher that made the database not write data to disk [0], for which a sample script is available [1], I found that the following patch in the debian package for libsqlcipher is interfering with the behavior of the code that relies on SQLITE_VERSION_NUMBER: 20-change-name-to-sqlcipher.patch The string set in the VERSION file is exported as SQLITE_VERSION_NUMBER in the headers. Since there are several checks (internal to the sqlcipher implementation, and in this case in the code for the c extension for pysqlcipher) that depend on SQLITE_VERSION_NUMBER, I'd suggest to add a different string, SQLCIPHER_VERSION / SQLCIPHER_VERSION_NUMBER and leave the original sqlite version string as in upstream, in order not to break code that depends on the origianl sqlite version which sqlcipher is based upon. In the short term, just skipping this patch will make the package usable for us again, greatly improving the situation. (note that the same problem affects also the version in wheezy-backports). [0] https://leap.se/code/issues/6688 [1] https://leap.se/code/attachments/318/test-sqlcipher2.py -- System Information: Debian Release: 8.0 APT prefers unstable APT policy: (500, 'unstable'), (500, 'oldstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages libsqlcipher0 depends on: ii libc6 2.19-13 ii libssl1.0.01.0.1k-1 ii multiarch-support 2.19-13 libsqlcipher0 recommends no packages. libsqlcipher0 suggests no packages. -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#776987: (no subject)
Severity: serious -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#754118: ITP: python-taskthread -- Simple thread module to repetitively perform a task on a single thread
Package: wnpp Severity: wishlist Owner: Ben Carrillo b...@futeisha.org * Package name: python-taskthread Version : 1.4 Upstream Author : John Herndon john.hern...@hp.com * URL : http://hpcloud.com/ * License : Apache 2 Programming Lang: Python Description : Simple thread module to repetitively perform a task on a single thread Python thread module to repeat an predefined task on a thread mulitple times. A TaskThread is useful when a task needs to be repeated several times on a separate thread. Normal usage of the threading.Thread class would call for creation of a new thread each time the same task needs to be run. This module allows for repetitive tasks to be run multiple times on the same thread by having the thread wait until the task needs to be executed again. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#754120: ITP: python-gnupg-ng -- A Python wrapper for GnuPG
Package: wnpp Severity: wishlist Owner: Ben Carrillo b...@futeisha.org * Package name: python-gnupg-ng Version : 1.2.6 Upstream Author : Isis Lovecruft i...@leap.se * URL : https://github.com/isislovecruft/python-gnupg * License : GPL Programming Lang: Python Description : A Python wrapper for GnuPG A Python interface for handling interactions with GnuPG, including keyfile generation, keyring maintenance, import and export, encryption and decryption, sending to and recieving from keyservers, and signing and verification. .. This is a fork of python-gnupg (from version 0.3.2), patched to sanitize untrusted inputs, due to the necessity of executing subprocess.Popen([...], shell=True) in order to communicate with GnuPG. Several speed improvements were also made based on code profiling, and the API has been cleaned up to support an easier, more Pythonic, interaction. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#726464: libsqlcipher0: missing SQLITE_TEMP_STORE=2 compile option
Package: libsqlcipher0
Version: 2.2.1-1
Severity: important
Tags: patch
Dear Maintainer,
While debugging a problem with pysqlcipher, I noticed that the compile
options of libsqlcipher are currently missing the SQLITE_TEMP_STORE=2 option.
According to the sqlcipher README, this option is needed for the correct
functioning:
https://github.com/sqlcipher/sqlcipher/blob/master/README#L39
The following patch fixes this:
--- debian/rules2013-08-13 23:10:32.0 -0300
+++ ../sqlcipher-2.2.1.patched/debian/rules 2013-10-15 15:42:46.946609101
-0300
@@ -34,6 +34,7 @@
./configure --prefix=/usr --mandir=/usr/share/man \
$(confflags) --enable-threadsafe \
--enable-load-extension \
+ --enable-tempstore \
--disable-tcl \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--libexecdir=\$${libdir}/sqlcipher \
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (800, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.10-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages libsqlcipher0 depends on:
ii libc6 2.17-93
ii libssl1.0.01.0.1e-3
ii multiarch-support 2.17-93
libsqlcipher0 recommends no packages.
libsqlcipher0 suggests no packages.
-- no debconf information
pgpMpw4Xot9KQ.pgp
Description: PGP signature
Bug#699123: about packaging python-sh
On Tue, Jan 29, 2013 at 12:52:54AM +, Laszlo Boszormenyi (GCS) wrote: Hi Ben, How the packaging goes? I've a package, ready to be uploaded. But the Hi Laszlo, I got a sponsor and it is already in the NEW queue. http://ftp-master.debian.org/new/python-sh_1.07-1.html Any feedback is more than welcome :) -- To UNSUBSCRIBE, email to debian-wnpp-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1359420774.21674.141.camel@julia -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#699122: package uploaded to mentors
I uploaded a first version of the package: https://mentors.debian.net/package/python-srp I got a sponsor who will be reviewing it soon, any other feedback is more than welcome. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
