Merge lp://staging/~kalon33/ubuntu/natty/pcsc-lite/merge-from-unstable into lp://staging/ubuntu/natty/pcsc-lite
| Status: | Rejected |
|---|---|
| Rejected by: | Martin Pitt |
| Proposed branch: | lp://staging/~kalon33/ubuntu/natty/pcsc-lite/merge-from-unstable |
| Merge into: | lp://staging/ubuntu/natty/pcsc-lite |
| Diff against target: | 52854 lines |
| To merge this branch: | bzr merge lp://staging/~kalon33/ubuntu/natty/pcsc-lite/merge-from-unstable |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Disapprove | ||
| Colin Watson | reviewing changes for "need fixing" | Pending | |
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-03-06.
Description of the change
Merge new upstream version from Debian Unstable, as ours is pretty old, and keep Ubuntu changes. This proposal includes corrections as requested by cjwatson.
| Nicolas DERIVE (kalon33) wrote | # |
| Nicolas DERIVE (kalon33) wrote | # |
Unmerged revisions
- 37. By Nicolas DERIVE
-
REALLY wipe out hal depends (was remaining in pcscd deps)
- 36. By Nicolas DERIVE
-
debian/rules: Keep our configure options, using dh tiny rules,
especially --disable-libhal, as requested by cjwatson. - 35. By Nicolas DERIVE
-
Change debian/changelog and debian/control taking into account cjwatson corrections.
- 34. By Nicolas DERIVE
-
Something from merging was remaining in debian/changelog. Adopt same solution as for the previous one.
- 33. By Nicolas DERIVE
-
REALLY update debian/control using the file from Debian packaging, to make sure it is not messed up anymore because of the merge.
- 32. By Nicolas DERIVE
-
Fix another merging trace in debian/control
- 31. By Nicolas DERIVE
-
fix a forgotten merging trace in debian/control
- 30. By Nicolas DERIVE
-
Merge from Debian Unstable (LP: #723016). Remaining changes:
- 29. By Nicolas DERIVE
-
Commit to resolve merging conflicts and keep Ubuntu changes:
* Merge from debian unstable. Remaining changes:
- Move runtime libraries to /lib, for the benefit of wpasupplicant.
- disable hal support. LP: #506908
- add build-dep on libusb-1.0-0-dev, fixes FTBFS
* debian/control: Drop libhal-dev build dependency, as we already configure
with --disable-libhal. Using libusb-1.0-0 instead.
* New upstream release
* Fix "missing dependency for libccid > 1.4" pcscd now depends on version
>= 1.4.1~ of libccid. Previous versions of libccid do not have the udev
rule file to set the device permissions so the reader is not usable with
the pcscd when run as NON root (Closes: #613404)
* Fix "missing dependecy for libpcsclite1 in fiting version" libpcsclite1
now depends on the exact same version of pcscd instead of just conflicting
with a previous version of pcscd (Closes: #613405)
* upload to unstable
* pcscd.dirs: remove usr/share/lintian/ overrides since the override file was
removed in 1.6.5-1
* New upstream release
* Fix "Regression: My card{,-reader} fails with 1.6.5-1" bug fixed upstream
(Closes: #606121)
* Fix "pcscd - Unneeded high privileges" pcscd is now running as a normal
user in the pcscd group (Closes: #606142)
See http://ludovicrousseau .blogspot. com/2010/ 09/pcscd- auto-start. html
The driver package shall privide a udev rule file to set the correct
permissions on the device. libccid does that.
* New upstream release
* debian/rules: do not install pcscd suid root
* debian/pcscd.lintian- overrides: removed since no more lintian warnings
* debian/pcscd.init: create $IPCDIR with correct access rights
* debian/pcscd.postinst: create the pcscd group and setgid pcscd to it
* debian/pcscd.README. Debian: remove outdated "pscsd starts before usbmgr"
section and add "pscsd sgid pcscd" section
* New upstream release
* debian/rules: install pcscd suid root. This was broken in previous
packages.
* debian/control: remove Conflicts: libccid (<= 1.0.0-1)
stable (lenny) already has libccid 1.3.8
lintian complained that Breaks should be used instead
* New upstream release
* New upstream release
* debian/rules: use the minimal dh rules
* debian/control: Standards-Version: 3.8.4 -> 3.9.1. No change needed.
* Fix "depends on pcscd which is priority: extra". The 3 packages are now
priority "optional" (Closes: #591151)
* New upstream release
* install an /etc/init.d/pcscd file again but with the daemon disabled.
This should ease upgrades and allow users to still start the daemon on
startup if needed.
* New upstream release
* debian/libpcsclite- dev.install: do not install libpcsclite.a since it is
no more built upstream.
* configure pcscd to use --enable-confdir= /etc/reader. conf.d instead of
/var/lib/pcscd since pcscd can now parse a directory and each file in it.
. Also remove update-reader. conf(8) script and related files since it is
now useless.
. pcscd.postinst now removes the unused files instead of calling
update-reader. conf. This script can be removed for squeeze+1
* debian/source/ format: use "3.0 (quilt)" format
* debian/rules: add --sysconfdir=/etc
* do not start pcscd at startup any more. pcscd is started by libpcsclite.so
when needed. But install pcscd as setuid root now. You can restrict the
access rights of pcscd to limit its use to a particular group if needed.
* debian/control: libpcsclite1 now Depends: instead of Suggests: on pcscd
The daemon is not started at boot time but only on request so the CPU cost
is zero if not used.
* Fix CVE-2010-4531: buffer overflow in the ATRDecodeAtr function in the
Answer-to-Reset (ATR) Handler (atrhandler.c)
* Closes: #607781 "pcsc-lite: buffer overflow"
* Initial Release.
* Modified rpc/Makefile.linux to install pcscd under sbin/
* Closes: bug#90184 - 28. By Nicolas DERIVE
-
Merging shared upstream rev into target branch.
Thanks for your contribution to Ubuntu!
This branch removes all the previous Ubuntu entries from debian/changelog. Please don't do this; you should keep them until such time as we can sync the package completely with Debian.
In several places, where there are colliding changes to the same few lines on the Debian side and the Ubuntu side, you have not resolved the conflict correctly. For instance, the previous Debian->Ubuntu diff had:
-Depends: libccid | pcsc-ifd-handler, ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), hal
+Depends: libccid | pcsc-ifd-handler, ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
Conflicts: libccid (<= 1.0.0-1)
Your new Debian->Ubuntu diff has:
-Depends: libccid (>= 1.4.1~) | pcsc-ifd-handler, ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), hal
+Depends: libccid | pcsc-ifd-handler, ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
+Conflicts: libccid (<= 1.0.0-1)
This is definitely not how the merge conflict should be resolved. What you should end up with is the same as the Debian side but with ", hal" removed.
-Conflicts: libpcsclite-dev (<< ${binary:Version})
-Depends: ${shlibs:Depends}, ${misc:Depends}, pcscd (= ${binary:Version})
+Conflicts: libpcsclite-dev (<< ${binary:Version}), pcscd (<< ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, pcscd
Could you explain this new Debian->Ubuntu diff? It isn't mentioned in the changelog.
Your debian/rules merge completely reverts the new tiny dh rules, using the previous rules instead. We don't do this in Ubuntu - can you please figure out how to make the change corresponding to the previous Debian->Ubuntu diff using the new rules style? Feel free to ask if you need help with this.