lp:~logan/ubuntu/raring/trousers/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/raring/trousers at revision 26

Ubuntu branches: Pending requested 2012-11-30

Diff: 13450 lines (+3912/-2843)

98 files modified

.gitignore (+0/-29)
Makefile.am (+1/-1)
Makefile.in (+79/-36)
aclocal.m4 (+282/-120)
autom4te.cache/output.0 (+143/-105)
autom4te.cache/output.1 (+143/-105)
autom4te.cache/requests (+9/-8)
autom4te.cache/traces.0 (+683/-636)
autom4te.cache/traces.1 (+984/-981)
config.guess (+31/-18)
config.sub (+39/-26)
configure (+143/-105)
configure.in (+2/-5)
debian/changelog (+25/-0)
debian/libtspi1.symbols (+0/-1)
debian/rules (+8/-0)
debian/trousers.prerm (+7/-0)
depcomp (+134/-56)
dist/Makefile.in (+34/-7)
install-sh (+18/-11)
ltmain.sh (+68/-55)
man/Makefile.in (+38/-14)
man/man3/Makefile.in (+53/-13)
man/man5/Makefile.in (+53/-13)
man/man8/Makefile.in (+53/-13)
missing (+4/-49)
src/Makefile.in (+38/-14)
src/include/Makefile.in (+50/-15)
src/include/hosttable.h (+0/-1)
src/include/rpc_tcstp.h (+1/-0)
src/include/tcslog.h (+7/-0)
src/tcs/Makefile.am (+1/-1)
src/tcs/Makefile.in (+36/-9)
src/tcs/rpc/tcstp/rpc.c (+6/-5)
src/tcs/rpc/tcstp/rpc_admin.c (+32/-8)
src/tcs/rpc/tcstp/rpc_aik.c (+12/-3)
src/tcs/rpc/tcstp/rpc_audit.c (+12/-3)
src/tcs/rpc/tcstp/rpc_auth.c (+8/-2)
src/tcs/rpc/tcstp/rpc_bind.c (+4/-1)
src/tcs/rpc/tcstp/rpc_caps.c (+4/-1)
src/tcs/rpc/tcstp/rpc_caps_tpm.c (+12/-3)
src/tcs/rpc/tcstp/rpc_certify.c (+4/-1)
src/tcs/rpc/tcstp/rpc_changeauth.c (+8/-2)
src/tcs/rpc/tcstp/rpc_cmk.c (+24/-6)
src/tcs/rpc/tcstp/rpc_context.c (+2/-0)
src/tcs/rpc/tcstp/rpc_counter.c (+20/-5)
src/tcs/rpc/tcstp/rpc_daa.c (+8/-2)
src/tcs/rpc/tcstp/rpc_delegate.c (+32/-8)
src/tcs/rpc/tcstp/rpc_dir.c (+8/-2)
src/tcs/rpc/tcstp/rpc_ek.c (+20/-5)
src/tcs/rpc/tcstp/rpc_evlog.c (+12/-3)
src/tcs/rpc/tcstp/rpc_key.c (+25/-6)
src/tcs/rpc/tcstp/rpc_maint.c (+20/-5)
src/tcs/rpc/tcstp/rpc_migration.c (+12/-3)
src/tcs/rpc/tcstp/rpc_nv.c (+20/-5)
src/tcs/rpc/tcstp/rpc_oper.c (+4/-1)
src/tcs/rpc/tcstp/rpc_own.c (+8/-2)
src/tcs/rpc/tcstp/rpc_pcr_extend.c (+12/-3)
src/tcs/rpc/tcstp/rpc_ps.c (+28/-7)
src/tcs/rpc/tcstp/rpc_quote.c (+4/-1)
src/tcs/rpc/tcstp/rpc_quote2.c (+4/-1)
src/tcs/rpc/tcstp/rpc_random.c (+8/-2)
src/tcs/rpc/tcstp/rpc_seal.c (+8/-2)
src/tcs/rpc/tcstp/rpc_selftest.c (+4/-1)
src/tcs/rpc/tcstp/rpc_sign.c (+4/-1)
src/tcs/rpc/tcstp/rpc_tick.c (+4/-1)
src/tcs/rpc/tcstp/rpc_transport.c (+12/-3)
src/tcs/tcs_aik.c (+1/-0)
src/tcs/tcs_context.c (+0/-5)
src/tcs/tcs_context_key.c (+1/-1)
src/tcs/tcs_evlog_biosem.c (+1/-1)
src/tcs/tcs_evlog_imaem.c (+12/-12)
src/tcs/tcs_pbg.c (+9/-5)
src/tcs/tcs_utils.c (+0/-6)
src/tcs/tcsi_caps_tpm.c (+0/-3)
src/tcs/tcsi_transport.c (+1/-1)
src/tcsd/Makefile.am (+2/-1)
src/tcsd/Makefile.in (+42/-11)
src/tcsd/tcsd_conf.c (+1/-0)
src/tcsd/tcsd_threads.c (+62/-159)
src/tddl/Makefile.am (+1/-1)
src/tddl/Makefile.in (+45/-13)
src/trspi/Makefile.in (+35/-8)
src/trspi/trousers.c (+2/-31)
src/tspi/Makefile.in (+43/-9)
src/tspi/obj_encdata.c (+5/-0)
src/tspi/obj_pcrs.c (+2/-0)
src/tspi/rpc/hosttable.c (+1/-1)
src/tspi/rpc/tcstp/rpc.c (+3/-6)
src/tspi/ssl_ui.c (+1/-0)
src/tspi/tsp_caps.c (+2/-0)
src/tspi/tsp_delegate.c (+6/-2)
src/tspi/tspi_admin.c (+14/-4)
src/tspi/tspi_dir.c (+1/-1)
src/tspi/tspi_maint.c (+0/-1)
src/tspi/tspi_quote.c (+8/-0)
src/tspi/tspi_quote2.c (+3/-1)
tools/Makefile.in (+36/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

26. By Logan Rosen on 2012-11-30

* Merge from Debian unstable. Remaining changes:
  - debian/trousers.postinst: Reload udev rules to reload new users and
    groups.
* Dropped Ubuntu change in debian/trousers.prerm to make remove work,
  as Debian made a different one with the same goal that works as well.
* Imported Upstream version 0.3.10
* Update symbols file
* Force build of tools
* Fix regression introduced in previous patch, preventing removal
  (Closes: #680375)

25. By Brian Murray on 2012-08-17

* debian/trousers.postinst: Reload udev rules to reload new users and
  groups. (LP: #959795) Thanks to James M Leddy for the patch.
* debian/trousers.prerm: let other arguments like remove work (LP: #1038302)

24. By Pierre Chifflier on 2012-07-04

Add workaround for upgrade failure for versions before 0.3.8-3
(Closes: #679621)

23. By Pierre Chifflier on 2012-06-18

* Imported Upstream version 0.3.9
* Refreshed Debian patches
* Removed patch 04-gcc46.patch, not required anymore

22. By Pierre Chifflier on 2012-06-16

* Fix typo in init script (Closes: #676828)
* Really save the pid of the daemon in /var/run.tcsd.pid (Closes: #676829)

21. By Pierre Chifflier on 2012-04-05

Add 05-gcc47.patch to fix FTBFS with gcc 4.7 (Closes: #667400)

20. By Stéphane Graber on 2012-02-24

releasing version 0.3.7-2ubuntu1

19. By Stéphane Graber on 2012-02-24

Use udevadm trigger to trigger 40-trousers before starting the daemon

18. By Pierre Chifflier on 2011-12-17

* Apply following patches, thanks to Laurent Bigonville:
  * Add $network to init script depends (Closes: #649954)
  * Do not use --background in init script (Closes: #649901)
* Also add --oknodo on start

17. By Pierre Chifflier on 2011-11-21

* Imported Upstream version 0.3.7
* Adopt package (set new maintainer) (Closes: #543932)
* Add pkg-config to build-depends
* Update symbols for libtspi1
* Use dh --with autoreconf
* Update patches to work with dh_autoreconf