diff options
| author | Jesse Jaggars <jjaggars@redhat.com> | 2012-03-05 11:38:43 -0600 |
|---|---|---|
| committer | Jesse Jaggars <jjaggars@redhat.com> | 2012-03-05 11:38:43 -0600 |
| commit | c69987bf6d2c0de8c345a8a79410212116f8098b (patch) | |
| tree | 6536b9e5e52bd3dc3a61e523946796cbcc2bda78 /gpgkeys | |
| parent | c10115652a795d0c7971ec9b03c4c58742063ddf (diff) | |
| download | sos-c69987bf6d2c0de8c345a8a79410212116f8098b.tar.gz | |
Refactoring DebianPackageManager to use the superclass
Squashed commit of the following:
commit 4973246ac9ade11bbaf113985a1410939ca3ccf5
Author: Adam Stokes <hackr@cypherbook.com>
Date: Mon Mar 5 00:15:00 2012 -0500
packaging: Fix install perms within our python package directory
and update packaging to use support dh_python2 helper.
During installation of plugins/policies we were giving additional
rwx bits to those files. This addresses some complaints from
debian's rpmlint equivalent lintian.
Also updated the build rules to support dh_python2 rather than
deprecated dh_pysupport.
Signed-off-by: Jesse Jaggars <jjaggars@redhat.com>
commit 986981941e058afb593baaba676b2aef0e6e1147
Author: Adam Stokes <hackr@cypherbook.com>
Date: Sun Mar 4 23:19:56 2012 -0500
ubuntu.template: set passphrase so anyone referencing will
know its an example.
Signed-off-by: Jesse Jaggars <jjaggars@redhat.com>
commit 809bdc150a5e2456d3ee87c34c06eaa002edf43c
Author: Adam Stokes <hackr@cypherbook.com>
Date: Sun Mar 4 23:11:33 2012 -0500
Makefile: generic name for build dir, fix failure during make install
and GPG configurable.
First, changed build dir from rpm-build to dist-build to keep
things more general.
Second, Makefile was not updated to reflect recent housecleaning
wrt removing TODO file
Finaly, added ability use optional gpg templates during build
phase
Signed-off-by: Jesse Jaggars <jjaggars@redhat.com>
commit 61d583d7eb913402f4200b5ece7ad2732cafd716
Author: Adam Stokes <hackr@cypherbook.com>
Date: Sun Mar 4 23:09:11 2012 -0500
debian/rules: Do not run dh_auto_test by default
For systems which do not contain previously installed
sosreport the test suite will fail due to not being
able to find the sos python package.
Signed-off-by: Jesse Jaggars <jjaggars@redhat.com>
commit a8950a892a905575da0993785623946ea8276075
Author: Adam Stokes <hackr@cypherbook.com>
Date: Sun Mar 4 23:02:24 2012 -0500
sos/policies/debian: do not use a list with shell_out routine
when listing packages.
A recent bug was previously found wrt shell_out not accepting
a list of commands/parameters. This policy is updated to run
the routine appropriately.
Signed-off-by: Jesse Jaggars <jjaggars@redhat.com>
commit 6b2300ee8bb121042f3dac91411773a8c788f6b8
Author: Adam Stokes <hackr@cypherbook.com>
Date: Sun Mar 4 22:46:33 2012 -0500
debian/control: Make package name consistent with other distros
Debian/Ubuntu was set with a package name sosreport which isn't
the package name during builds on RHEL/Fedora.
Signed-off-by: Jesse Jaggars <jjaggars@redhat.com>
Diffstat (limited to 'gpgkeys')
| -rw-r--r-- | gpgkeys/rh.template (renamed from gpgkeys/gpg.template) | 0 | ||||
| -rw-r--r-- | gpgkeys/ubuntu.template | 14 |
2 files changed, 14 insertions, 0 deletions
diff --git a/gpgkeys/gpg.template b/gpgkeys/rh.template index 261f5b31..261f5b31 100644 --- a/gpgkeys/gpg.template +++ b/gpgkeys/rh.template diff --git a/gpgkeys/ubuntu.template b/gpgkeys/ubuntu.template new file mode 100644 index 00000000..ac0e8b5e --- /dev/null +++ b/gpgkeys/ubuntu.template @@ -0,0 +1,14 @@ +%echo Generating key... +Key-Type: DSA +Key-Length: 1024 +Subkey-Type: ELG-E +Subkey-Length: 1024 +Name-Real: Ubuntu Support +Name-Comment: SoS Encryption Key +Name-Email: support@canonical.com +Expire-Date: 0 +Passphrase: ubuntutemplateexample +%pubring gpgkeys/ubuntusupport.pub +%secring gpgkeys/ubuntusupport.key +%commit +%echo done |