From e76dd7cf1f648fc5225de79ff52b93a0494c36a80d4e6a032466617bc892bb06 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 20 Dec 2014 15:56:51 +0000 Subject: [PATCH 1/2] Accepting request 265923 from home:posophe:branches:Base:System Fixed OBS-URL: https://build.opensuse.org/request/show/265923 OBS-URL: https://build.opensuse.org/package/show/Base:System/acct?expand=0&rev=38 --- acct-6.6.1.tar.gz | 3 --- acct-6.6.1.tar.gz.sig | 8 -------- acct-hz.patch => acct-6.6.2-hz.patch | 15 ++------------- acct-6.6.2.tar.gz | 3 +++ acct-6.6.2.tar.gz.sig | 8 ++++++++ acct.changes | 19 +++++++++++++++++++ acct.spec | 12 ++++-------- 7 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 acct-6.6.1.tar.gz delete mode 100644 acct-6.6.1.tar.gz.sig rename acct-hz.patch => acct-6.6.2-hz.patch (90%) create mode 100644 acct-6.6.2.tar.gz create mode 100644 acct-6.6.2.tar.gz.sig diff --git a/acct-6.6.1.tar.gz b/acct-6.6.1.tar.gz deleted file mode 100644 index 320afe1..0000000 --- a/acct-6.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:554515611ef9299012b7510050868a48fc178ce1544947123ab46ec50230ffcb -size 2869677 diff --git a/acct-6.6.1.tar.gz.sig b/acct-6.6.1.tar.gz.sig deleted file mode 100644 index 68bfd4b..0000000 --- a/acct-6.6.1.tar.gz.sig +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) -Comment: GPGTools - http://gpgtools.org - -iD8DBQBROn/g6I0XmJx2NrwRArv8AJ98juuCc9UfuKoIurlvpNcL+bBGyQCgzO1K -xdF+iq2sbYh/kM+Dd6vddP0= -=VPi0 ------END PGP SIGNATURE----- diff --git a/acct-hz.patch b/acct-6.6.2-hz.patch similarity index 90% rename from acct-hz.patch rename to acct-6.6.2-hz.patch index 864bca7..579fdd6 100644 --- a/acct-hz.patch +++ b/acct-6.6.2-hz.patch @@ -9,17 +9,6 @@ Index: acct-6.6.1/lastcomm.c =================================================================== --- acct-6.6.1.orig/lastcomm.c 2011-03-16 23:50:13.000000000 +0100 +++ acct-6.6.1/lastcomm.c 2013-12-21 23:54:26.496776873 +0100 -@@ -49,6 +49,10 @@ MA 02139, USA. */ - - #include - -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ - #include "common.h" - #include "files.h" - #include "uid_hash.h" @@ -71,7 +75,7 @@ int debugging_enabled = 0; /* Nonzero me int strict_match_flag = 0; /* Nonzero if each record has to match all items on the command line */ @@ -48,10 +37,10 @@ Index: acct-6.6.1/sa.c =================================================================== --- acct-6.6.1.orig/sa.c 2011-03-16 23:50:13.000000000 +0100 +++ acct-6.6.1/sa.c 2013-12-21 23:54:26.497776877 +0100 -@@ -189,7 +189,7 @@ int dont_read_summary_files = 0; - int print_users = 0; +@@ -190,7 +190,7 @@ int percentages = 0; /* include percentages in printout */ int user_summary_flag = 0; /* are we printing a user summary? */ + int group_summary_flag = 0; /* are we printing a group summary? */ -int ahz = AHZ; /* for viewing logs from another system */ +int ahz = 0; /* for viewing logs from another system */ diff --git a/acct-6.6.2.tar.gz b/acct-6.6.2.tar.gz new file mode 100644 index 0000000..eaed23a --- /dev/null +++ b/acct-6.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101 +size 852375 diff --git a/acct-6.6.2.tar.gz.sig b/acct-6.6.2.tar.gz.sig new file mode 100644 index 0000000..afc6902 --- /dev/null +++ b/acct-6.6.2.tar.gz.sig @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.20 (GNU/Linux) +Comment: GPGTools - http://gpgtools.org + +iD8DBQBUXah66I0XmJx2NrwRArrGAJ9dPOcXCDInhWE1NKuQGq18k0HsKgCg0mZT +xTfFjV9lPDwMJEr8NUeyLfE= +=qM8Q +-----END PGP SIGNATURE----- diff --git a/acct.changes b/acct.changes index 8561d14..57f4a0f 100644 --- a/acct.changes +++ b/acct.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Dec 19 13:01:30 UTC 2014 - p.drouand@gmail.com + +- Add back .keyring and .sig files; OBS verify them too + +------------------------------------------------------------------- +Sat Dec 13 20:57:10 UTC 2014 - p.drouand@gmail.com + +- Update to version 6.6.2 + + Link with -lm. + + Fix texi. + + The rest of fixes from 6.5.5 to 6.6.1. +- Update Url to new project home +- Use download Url +- Remove dependency on gpg-offline and keyring files; let OBS handle + source verification +- Adapt acct-hz.patch to upstream changes + > acct-6.6.2-hz.patch + ------------------------------------------------------------------- Thu Aug 28 13:18:29 UTC 2014 - vcizek@suse.com diff --git a/acct.spec b/acct.spec index 3d63ba4..07fa137 100644 --- a/acct.spec +++ b/acct.spec @@ -17,15 +17,12 @@ Name: acct -Version: 6.6.1 +Version: 6.6.2 Release: 0 -Source: %{name}-%{version}.tar.gz +Source: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz Source1: acct.service Source2: logrotate.acct Source3: accton-create -Source10: %{name}-%{version}.tar.gz.sig -Source11: %{name}.keyring -BuildRequires: gpg-offline BuildRequires: libtool %if %suse_version >= 1310 BuildRequires: systemd-rpm-macros @@ -47,10 +44,10 @@ Requires(post): coreutils Requires(postun): %install_info_prereq Requires(postun): fileutils Requires(postun): coreutils -Patch: %{name}-hz.patch +Patch: %{name}-%{version}-hz.patch Patch2: %{name}-info.patch Patch3: %{name}-ac.patch -Url: http://www.gnu.org/directory/acct.html +Url: http://www.gnu.org/software/acct/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: User-Specific Process Accounting License: GPL-2.0+ @@ -61,7 +58,6 @@ This package contains the programs necessary for user-specific process accounting: sa, accton, and lastcomm. %prep -%gpg_verify %{SOURCE10} %setup -q %patch -p1 %patch2 -p1 From 451a60663a4b4651b554eeeaa008244a52f52d7d862abc9b3b55476fa92bed5a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 20 Dec 2014 15:57:36 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/acct?expand=0&rev=39 --- acct.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/acct.spec b/acct.spec index 07fa137..b9e8ec0 100644 --- a/acct.spec +++ b/acct.spec @@ -20,6 +20,8 @@ Name: acct Version: 6.6.2 Release: 0 Source: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz +Source4: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz.sig +Source5: %name.keyring Source1: acct.service Source2: logrotate.acct Source3: accton-create