From 1b459abc8cf34693d5f23f7fd8fe8ed6c08950a7 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 19:56:53 -0800 Subject: Update Debian copyright file --- debian/copyright | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'debian/copyright') diff --git a/debian/copyright b/debian/copyright index 17576f5..fc867cc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,28 +1,31 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: Russ Allbery Source: http://www.eyrie.org/~eagle/software/wallet/ -Copyright: 2006-2010, 2012-2014 +Copyright: 2014, 2016 Russ Allbery + 2006-2010, 2012-2015 The Board of Trustees of the Leland Stanford Junior University License: Expat Files: * -Copyright: 2000-2002, 2004-2014 Russ Allbery - 2001-2014 The Board of Trustees of the Leland Stanford Junior University +Copyright: 2000-2002, 2004-2016 Russ Allbery + 2001-2015 The Board of Trustees of the Leland Stanford Junior University + 2015 Dropbox, Inc. License: Expat Files: Makefile.in -Copyright: 1994-2013 Free Software Foundation, Inc. +Copyright: 1994-2014 Free Software Foundation, Inc. 2006-2008, 2010, 2013-2014 The Board of Trustees of the Leland Stanford Junior University + 2016 Russ Allbery License: FSF-unlimited and Expat Files: aclocal.m4 -Copyright: 1996-2013 Free Software Foundation, Inc. +Copyright: 1996-2015 Free Software Foundation, Inc. License: FSF-unlimited Files: build-aux/ar-lib build-aux/compile build-aux/depcomp build-aux/missing -Copyright: 1996-2013 Free Software Foundation, Inc. +Copyright: 1996-2014 Free Software Foundation, Inc. License: GPL-2+ with Autoconf exception or Expat Files: build-aux/install-sh @@ -58,7 +61,7 @@ Files: client/wallet-rekey.1 client/wallet-rekey.pod client/wallet.1 docs/stanford-naming perl/t/data/README tests/HOWTO tests/config/README Copyright: 2006-2014 The Board of Trustees of the Leland Stanford Junior University - 2010 Russ Allbery + 2010, 2016 Russ Allbery License: all-permissive Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and @@ -71,10 +74,12 @@ License: FSF-configure This script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Files: m4/gssapi.m4 m4/krb5-config.m4 m4/krb5.m4 m4/lib-depends.m4 - m4/lib-pathname.m4 m4/remctl.m4 m4/snprintf.m4 m4/vamacros.m4 +Files: m4/clang.m4 m4/gssapi.m4 m4/krb5-config.m4 m4/krb5.m4 + m4/lib-depends.m4 m4/lib-pathname.m4 m4/remctl.m4 m4/snprintf.m4 + m4/vamacros.m4 Copyright: 2005-2014 The Board of Trustees of the Leland Stanford Junior University + 2015 Russ Allbery License: unlimited This file is free software; the authors give unlimited permission to copy and/or distribute it, with or without modifications, as long as this @@ -83,10 +88,8 @@ License: unlimited Files: portable/asprintf.c portable/dummy.c portable/krb5-extra.c portable/krb5.h portable/macros.h portable/mkstemp.c portable/reallocarray.c portable/setenv.c portable/stdbool.h - portable/strlcat.c portable/strlcpy.c portable/system.h portable/uio.h - tests/portable/asprintf-t.c tests/portable/mkstemp-t.c - tests/portable/setenv-t.c tests/portable/strlcat-t.c - tests/portable/strlcpy-t.c util/macros.h + portable/system.h portable/uio.h tests/portable/asprintf-t.c + tests/portable/mkstemp-t.c tests/portable/setenv-t.c util/macros.h Copyright: no copyright notice, see License License: rra-public-domain The authors hereby relinquish any claim to any copyright that they may @@ -112,6 +115,7 @@ Copyright: 1991, 1994-2003 The Internet Software Consortium and Rich Salz 2004-2006 Internet Systems Consortium, Inc. 2008-2010, 2012-2014 The Board of Trustees of the Leland Stanford Junior University + 2015 Russ Allbery License: ISC Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above -- cgit v1.2.3 From b101f21f06ef5e73a0c44f448282a3e6b53e48fc Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 17 Jan 2016 20:02:29 -0800 Subject: Add new dependencies, run wrap-and-sort -ast New wallet object types, ACLs, and kadmin backends require new modules. Flesh out the build dependencies and suggests, and then clean up all the control files with wrap-and-sort -ast. --- debian/changelog | 1 + debian/control | 76 +++++++++++++++++++++++++++++++++---------- debian/copyright | 1 - debian/keytab-backend.install | 5 ++- debian/wallet-client.install | 2 +- debian/wallet-server.install | 3 +- 6 files changed, 64 insertions(+), 24 deletions(-) (limited to 'debian/copyright') diff --git a/debian/changelog b/debian/changelog index 11a7fc2..374678c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ wallet (1.3-1) UNRELEASED; urgency=medium - New report that dumps all object history. - Displays of ACLs and ACL entries are now sorted correctly. * Change the branch layout to follow DEP-14. + * Run wrap-and-sort -ast on the package. -- Russ Allbery Sun, 17 Jan 2016 19:40:54 -0800 diff --git a/debian/control b/debian/control index 9296899..d582008 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,33 @@ Section: net Priority: extra Maintainer: Russ Allbery Bugs: mailto:rra@debian.org -Build-Depends: debhelper (>= 9), dh-autoreconf, libauthen-sasl-perl, - libdatetime-perl, libdatetime-format-sqlite-perl, libdbd-sqlite3-perl, - libdbi-perl, libdbix-class-perl, libheimdal-kadm5-perl, libkrb5-dev, - libnet-dns-perl, libnet-duo-perl, libnet-ldap-perl, libremctl-dev, - libsql-translator-perl, libtest-minimumversion-perl, libtest-pod-perl, - libtest-strict-perl, libtimedate-perl, libwebauth-perl, perl, sqlite3 +Build-Depends: + debhelper (>= 9), + dh-autoreconf, + libauthen-sasl-perl, + libcrypt-generatepassword-perl, + libdatetime-format-sqlite-perl, + libdatetime-perl, + libdbd-sqlite3-perl, + libdbi-perl, + libdbix-class-perl, + libheimdal-kadm5-perl, + libjson-perl, + libkrb5-dev, + libnet-dns-perl, + libnet-duo-perl, + libnet-ldap-perl, + libnet-remctl-perl, + libperl6-slurp-perl, + libremctl-dev, + libsql-translator-perl, + libtest-minimumversion-perl, + libtest-pod-perl, + libtest-strict-perl, + libtimedate-perl, + libwebauth-perl, + perl, + sqlite3, Standards-Version: 3.9.6 Homepage: http://www.eyrie.org/~eagle/software/wallet/ Vcs-Git: git://git.eyrie.org/kerberos/wallet.git -b debian/master @@ -17,8 +38,12 @@ Vcs-Browser: http://git.eyrie.org/?p=kerberos/wallet.git Package: keytab-backend Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, ${perl:Depends}, krb5-admin-server, perl, - remctl-server +Depends: + krb5-admin-server, + perl, + remctl-server, + ${misc:Depends}, + ${perl:Depends}, Description: Provide existing MIT Kerberos keytabs via remctl keytab-backend is a service that runs under remctld and allows authenticated clients to download Kerberos keytabs from an MIT Kerberos @@ -30,7 +55,9 @@ Description: Provide existing MIT Kerberos keytabs via remctl Package: wallet-client Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends}, Description: Kerberos-authenticated secure data management client The wallet is a system for managing secure data, authorization rules to retrieve or change that data, and audit rules for documenting actions @@ -47,15 +74,30 @@ Description: Kerberos-authenticated secure data management client Package: wallet-server Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, ${perl:Depends}, - libdatetime-format-sqlite-perl | libdatetime-format-mysql-perl | - libdatetime-format-pg-perl, +Depends: + libdatetime-format-sqlite-perl | libdatetime-format-mysql-perl | libdatetime-format-pg-perl, + libdatetime-perl, libdbd-sqlite3-perl | libdbd-mysql-perl | libdbd-pg-perl, - libdbix-class-perl, libdatetime-perl, libsql-translator-perl, - libtimedate-perl, remctl-server -Recommends: krb5-user | libheimdal-kadm5-perl, remctl-server (>= 2.14) -Suggests: libauthen-sasl-perl, libnet-duo-perl, libnet-ldap-perl, - libnet-remctl-perl, libwebauth-perl (>= 4.4.0) + libdbi-perl, + libdbix-class-perl, + libsql-translator-perl, + libtimedate-perl, + remctl-server, + ${misc:Depends}, + ${perl:Depends}, +Recommends: + krb5-user | libheimdal-kadm5-perl, + remctl-server (>= 2.14), +Suggests: + libauthen-sasl-perl, + libcrypt-generatepassword-perl, + libipc-run-perl, + libjson-perl, + libnet-duo-perl, + libnet-ldap-perl, + libnet-remctl-perl, + libperl6-slurp-perl, + libwebauth-perl (>= 4.4.0), Description: Kerberos-authenticated secure data management server The wallet is a system for managing secure data, authorization rules to retrieve or change that data, and audit rules for documenting actions diff --git a/debian/copyright b/debian/copyright index fc867cc..faa5cc6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -180,4 +180,3 @@ Comment: The option described in the license has been accepted and these files are distributed under the same terms as the package as a whole, as described at the top of this file. You can find the GPL version 2 in /usr/share/common-licenses/GPL-2 on Debian systems. - diff --git a/debian/keytab-backend.install b/debian/keytab-backend.install index 666b71c..52a736e 100644 --- a/debian/keytab-backend.install +++ b/debian/keytab-backend.install @@ -1,6 +1,5 @@ +config/allow-extract etc/krb5kdc +config/keytab etc/remctl/conf.d debian/tmp/etc/remctl/acl/keytab debian/tmp/usr/sbin/keytab-backend debian/tmp/usr/share/man/man8/keytab-backend.8 - -config/allow-extract etc/krb5kdc -config/keytab etc/remctl/conf.d diff --git a/debian/wallet-client.install b/debian/wallet-client.install index 2940357..1807636 100644 --- a/debian/wallet-client.install +++ b/debian/wallet-client.install @@ -1,4 +1,4 @@ debian/tmp/usr/bin/wallet debian/tmp/usr/bin/wallet-rekey -debian/tmp/usr/share/man/man1/wallet.1 debian/tmp/usr/share/man/man1/wallet-rekey.1 +debian/tmp/usr/share/man/man1/wallet.1 diff --git a/debian/wallet-server.install b/debian/wallet-server.install index dfc1d6e..f4f5bdc 100644 --- a/debian/wallet-server.install +++ b/debian/wallet-server.install @@ -1,3 +1,4 @@ +config/wallet etc/remctl/conf.d debian/tmp/etc/remctl/acl/wallet-report debian/tmp/usr/sbin/wallet-admin debian/tmp/usr/sbin/wallet-backend @@ -8,5 +9,3 @@ debian/tmp/usr/share/man/man8/wallet-backend.8 debian/tmp/usr/share/man/man8/wallet-report.8 debian/tmp/usr/share/perl5 debian/tmp/usr/share/wallet - -config/wallet etc/remctl/conf.d -- cgit v1.2.3