Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: pu
Hello,
The package failed to upgrade from squeeze to wheezy. See bug #707756.
This was because the user made local changes. But the fix in the package
is easy.
I also include 2 important bug fixes from upstream (I am also the
upstream maintainer).
May I proceed with an upload?
diff -Nru pcsc-lite-1.8.4/debian/changelog pcsc-lite-1.8.4/debian/changelog
--- pcsc-lite-1.8.4/debian/changelog 2012-06-26 21:14:20.000000000 +0200
+++ pcsc-lite-1.8.4/debian/changelog 2013-05-15 13:12:56.000000000 +0200
@@ -1,3 +1,15 @@
+pcsc-lite (1.8.4-1+deb7u1) unstable; urgency=low
+
+ * Fix "failed upgrade squeeze -> wheezy" by removing addgroup call
+ (Closes: #707756)
+ The pcscd group was instroduced in pcsc-lite 1.6.0 no more used
+ since pcsc-lite 1.8.0
+ * Correctly check systemd is running (backport from change in 1.8.8-3)
+ * debian/patches/{readerfactory,winscard_clnt}: two important fixes from
+ upstream newer versions.
+
+ -- Ludovic Rousseau <[email protected]> Sat, 11 May 2013 11:49:01 +0000
+
pcsc-lite (1.8.4-1) unstable; urgency=high
* New upstream release
diff -Nru pcsc-lite-1.8.4/debian/patches/readerfactory
pcsc-lite-1.8.4/debian/patches/readerfactory
--- pcsc-lite-1.8.4/debian/patches/readerfactory 1970-01-01
01:00:00.000000000 +0100
+++ pcsc-lite-1.8.4/debian/patches/readerfactory 2013-05-15
11:47:20.000000000 +0200
@@ -0,0 +1,14 @@
+From: Ludovic Rousseau <[email protected]>
+Subject: RFAddReader(): fix a off-by-one bug
+Origin: upstream,
http://anonscm.debian.org/viewvc/pcsclite/?view=revision&revision=6384
+--- a/src/readerfactory.c
++++ b/src/readerfactory.c
+@@ -120,7 +120,7 @@
+ return SCARD_E_INVALID_VALUE;
+
+ /* allocate memory that is automatically freed */
+- readerName = alloca(strlen(readerNameLong));
++ readerName = alloca(strlen(readerNameLong)+1);
+ strcpy(readerName, readerNameLong);
+
+ /* Reader name too long? also count " 00 00"*/
diff -Nru pcsc-lite-1.8.4/debian/patches/series
pcsc-lite-1.8.4/debian/patches/series
--- pcsc-lite-1.8.4/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ pcsc-lite-1.8.4/debian/patches/series 2013-05-15 11:48:08.000000000
+0200
@@ -0,0 +1,2 @@
+readerfactory
+winscard_clnt
diff -Nru pcsc-lite-1.8.4/debian/patches/winscard_clnt
pcsc-lite-1.8.4/debian/patches/winscard_clnt
--- pcsc-lite-1.8.4/debian/patches/winscard_clnt 1970-01-01
01:00:00.000000000 +0100
+++ pcsc-lite-1.8.4/debian/patches/winscard_clnt 2013-05-15
13:10:15.000000000 +0200
@@ -0,0 +1,13 @@
+From: Ludovic Rousseau <[email protected]>
+Subject: SCardBeginTransaction(): remove an extra line
+Origin: upstream,
http://anonscm.debian.org/viewvc/pcsclite/?view=revision&revision=6385
+--- a/src/winscard_clnt.c
++++ b/src/winscard_clnt.c
+@@ -1200,7 +1200,6 @@
+ (void)pthread_mutex_unlock(currentContextMap->mMutex);
+ (void)SYS_USleep(PCSCLITE_LOCK_POLL_RATE);
+ }
+- while (SCARD_E_SHARING_VIOLATION == rv);
+
+ (void)pthread_mutex_unlock(currentContextMap->mMutex);
+
diff -Nru pcsc-lite-1.8.4/debian/pcscd.postinst
pcsc-lite-1.8.4/debian/pcscd.postinst
--- pcsc-lite-1.8.4/debian/pcscd.postinst 2011-11-27 20:36:59.000000000
+0100
+++ pcsc-lite-1.8.4/debian/pcscd.postinst 2013-05-15 11:19:54.000000000
+0200
@@ -16,10 +16,7 @@
rm -rf $CFGDIR
fi
-# create the pcscd group
-addgroup --system pcscd --quiet
-
# enable pcscd for systemd
-[ -x /bin/systemctl ] && [ -d /sys/fs/cgroup/systemd ] && systemctl enable
pcscd.socket
+[ -x /bin/systemctl ] && [ -d /run/systemd/system ] && systemctl enable
pcscd.socket
#DEBHELPER#
#DEBHELPER#
-- System Information:
Debian Release: 7.0
APT prefers stable
APT policy: (990, 'stable'), (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/20130515112734.3209.32014.reportbug@debian
