From a17da627518efd5d7b3717cf4be6894d9cdfc399 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 21 Apr 2008 20:00:08 +0000 Subject: [PATCH 01/12] Initialize branch F-9 for sectool --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 052657a8edf51a010a7eef1c48e3f2bb98fc7f4c Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Wed, 23 Apr 2008 08:26:34 +0000 Subject: [PATCH 02/12] new upstream release --- .cvsignore | 2 +- sectool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index a13a1ce..e07d590 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sectool-0.7.0.tar.bz2 +sectool-0.7.1.tar.bz2 diff --git a/sectool.spec b/sectool.spec index 015800d..fa6e138 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,7 +1,7 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.7.0 -Release: 1%{?dist} +Version: 0.7.1 +Release: 1 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 License: GPLv2+ @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 21 2008 Peter Vrabec - 0.7.1-1 +- new upstream release + * Tue Apr 08 2008 Peter Vrabec - 0.7.0-1 - new upstream release diff --git a/sources b/sources index ded1c4c..b34b6ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e76c6dc4894e1e3179ae20b6d519fec sectool-0.7.0.tar.bz2 +36a7be93498bb47b06624979616ac725 sectool-0.7.1.tar.bz2 From 6ff0bab6b940579583908cf2b3f93e7822e41fe9 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Wed, 23 Apr 2008 08:28:19 +0000 Subject: [PATCH 03/12] add dist tag back --- sectool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sectool.spec b/sectool.spec index fa6e138..7205fb7 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,7 +1,7 @@ Summary: A security audit system and intrusion detection system Name: sectool Version: 0.7.1 -Release: 1 +Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 License: GPLv2+ From e5015d832485d868fdd5ac964be7b226d7bebfb5 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Mon, 28 Apr 2008 15:51:41 +0000 Subject: [PATCH 04/12] new upstream release --- .cvsignore | 2 +- sectool.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e07d590..786a640 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sectool-0.7.1.tar.bz2 +sectool-0.7.3.tar.bz2 diff --git a/sectool.spec b/sectool.spec index 7205fb7..c08331c 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,6 +1,6 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.7.1 +Version: 0.7.3 Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 @@ -93,6 +93,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 28 2008 Peter Vrabec - 0.7.3-1 +- new upstream release +- better test integration + +* Fri Apr 25 2008 Peter Vrabec - 0.7.2-1 +- new upstream release +- Support overriding level configuration in ~/.sectoolrc +- Add saving level configuration in GUI: + * Mon Apr 21 2008 Peter Vrabec - 0.7.1-1 - new upstream release diff --git a/sources b/sources index b34b6ce..9055a68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36a7be93498bb47b06624979616ac725 sectool-0.7.1.tar.bz2 +989a9a8c02ce89bd3fb107157f97ade0 sectool-0.7.3.tar.bz2 From add26e7ec9770ce36ccdd7432b100d671bb55d05 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Thu, 22 May 2008 12:41:50 +0000 Subject: [PATCH 05/12] upgrade --- .cvsignore | 2 +- sectool-0.7.4-filesystem.patch | 37 ++++++++++++++++++++++++++++++++++ sectool.spec | 19 +++++++++++------ sources | 2 +- 4 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 sectool-0.7.4-filesystem.patch diff --git a/.cvsignore b/.cvsignore index 786a640..917386a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sectool-0.7.3.tar.bz2 +sectool-0.7.4.tar.bz2 diff --git a/sectool-0.7.4-filesystem.patch b/sectool-0.7.4-filesystem.patch new file mode 100644 index 0000000..4a5893f --- /dev/null +++ b/sectool-0.7.4-filesystem.patch @@ -0,0 +1,37 @@ +diff --git a/src/filesystem.c b/src/filesystem.c +index eab000f..c28901b 100644 +--- a/src/filesystem.c ++++ b/src/filesystem.c +@@ -48,14 +48,14 @@ struct envinit_t vars[]={ + * Error IDs + */ + #define ID_DIRWORLDW 1 +-#define ID_FILEWORLDGROUPWX 2 ++#define ID_FILEGROUPWX 2 + #define ID_FILEWORLDW 3 + #define ID_GROUPNOTFOUND 4 + #define ID_NOPKG 5 + #define ID_SUIDSCRIPT 6 + #define ID_USERNOTFOUND 7 + #define ID_WRONGSYMLINK 8 +- ++#define ID_FILEWORLDWX 9 + + #define MAX_DIR_STACK_SIZE 16384 + +@@ -223,9 +223,12 @@ void check_object (const char *path, const struct stat *s) { + } + + /* executable and world/group writable */ +- if ((s->st_mode&(S_IXUSR|S_IXGRP|S_IXOTH)) && +- (s->st_mode&(S_IWGRP|S_IWOTH))) { +- report (WARNING, ID_FILEWORLDGROUPWX, "File \"%s\" is executable and world/group writable.\n", path); ++ if ((s->st_mode&(S_IXUSR|S_IXGRP|S_IXOTH))) { ++ if (s->st_mode&(S_IWOTH)) { ++ report (ERROR, ID_FILEWORLDWX, "File \"%s\" is executable and world writable.\n", path); ++ } else if (s->st_mode&(S_IWGRP)) { ++ report (WARNING, ID_FILEGROUPWX, "File \"%s\" is executable and group writable.\n", path); ++ } + } + + /* SUID script */ diff --git a/sectool.spec b/sectool.spec index c08331c..10a8a2b 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,15 +1,14 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.7.3 -Release: 1%{?dist} +Version: 0.7.4 +Release: 2%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 +Patch1: sectool-0.7.4-filesystem.patch License: GPLv2+ Group: Applications/System -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildArch: noarch -Requires: python2 gettext coreutils -BuildRequires: desktop-file-utils gettext intltool +Requires: python2 gettext coreutils rpm-python +BuildRequires: desktop-file-utils gettext intltool rpm-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package gui @@ -32,6 +31,7 @@ sectool-gui provides a GTK-based graphical user interface to sectool. %prep %setup -q +%patch1 -p1 -b .filesystem %build make %{?_smp_mflags} @@ -93,6 +93,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 22 2008 Peter Vrabec - 0.7.4-2 +- filesystem: distinguish between world and group +w permission + +* Wed May 21 2008 Peter Vrabec - 0.7.4-1 +- new upstream release, lots of fixes and improvements, + see changelog + * Mon Apr 28 2008 Peter Vrabec - 0.7.3-1 - new upstream release - better test integration diff --git a/sources b/sources index 9055a68..01850ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -989a9a8c02ce89bd3fb107157f97ade0 sectool-0.7.3.tar.bz2 +dd2c9dd80c237fc47f66c33b363ec01a sectool-0.7.4.tar.bz2 From 023f3413cbc6a48bda384594739bf9fd09c3168b Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Thu, 22 May 2008 14:41:19 +0000 Subject: [PATCH 06/12] fix aliases fullpath issue --- sectool-0.7.4-aliases.patch | 17 +++++++++++++++++ sectool.spec | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 sectool-0.7.4-aliases.patch diff --git a/sectool-0.7.4-aliases.patch b/sectool-0.7.4-aliases.patch new file mode 100644 index 0000000..8fc0494 --- /dev/null +++ b/sectool-0.7.4-aliases.patch @@ -0,0 +1,17 @@ +diff --git a/tests/aliases.sh b/tests/aliases.sh +index ea578ce..6d9c274 100755 +--- a/tests/aliases.sh ++++ b/tests/aliases.sh +@@ -41,9 +41,10 @@ bash -i -c 'alias' | sed 's/^alias//' | + if [[ "$is_command" == "1" ]] + then + fullpath="`which $command 2>&1`" +- ++ commandWithoutPath="`basename $command`" ++ + # does is exist? +- if [[ "`echo "$fullpath" |grep -c "no $command in"`" == "1" ]] ++ if [[ "`echo "$fullpath" |grep -c "no $commandWithoutPath in"`" == "1" ]] + then + if [[ "$command" != "alias" ]] # fedora uses something strange for 'which'.. + then diff --git a/sectool.spec b/sectool.spec index 10a8a2b..7f00f4e 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,10 +1,13 @@ Summary: A security audit system and intrusion detection system Name: sectool Version: 0.7.4 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart + Source0: %{name}-%{version}.tar.bz2 Patch1: sectool-0.7.4-filesystem.patch +Patch2: sectool-0.7.4-aliases.patch + License: GPLv2+ Group: Applications/System Requires: python2 gettext coreutils rpm-python @@ -32,6 +35,7 @@ sectool-gui provides a GTK-based graphical user interface to sectool. %prep %setup -q %patch1 -p1 -b .filesystem +%patch2 -p1 -b .aliases %build make %{?_smp_mflags} @@ -93,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 22 2008 Peter Vrabec - 0.7.4-3 +- fix aliases fullpath issue + * Thu May 22 2008 Peter Vrabec - 0.7.4-2 - filesystem: distinguish between world and group +w permission From 67101a6b8d71b30f9e69bd75d60babacf55c9d78 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Mon, 26 May 2008 14:14:49 +0000 Subject: [PATCH 07/12] upgrade --- .cvsignore | 2 +- sectool-0.7.4-aliases.patch | 17 ---------------- sectool-0.7.4-filesystem.patch | 37 ---------------------------------- sectool.spec | 17 ++++------------ sources | 2 +- 5 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 sectool-0.7.4-aliases.patch delete mode 100644 sectool-0.7.4-filesystem.patch diff --git a/.cvsignore b/.cvsignore index 917386a..008d7e8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sectool-0.7.4.tar.bz2 +sectool-0.7.5.tar.bz2 diff --git a/sectool-0.7.4-aliases.patch b/sectool-0.7.4-aliases.patch deleted file mode 100644 index 8fc0494..0000000 --- a/sectool-0.7.4-aliases.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/tests/aliases.sh b/tests/aliases.sh -index ea578ce..6d9c274 100755 ---- a/tests/aliases.sh -+++ b/tests/aliases.sh -@@ -41,9 +41,10 @@ bash -i -c 'alias' | sed 's/^alias//' | - if [[ "$is_command" == "1" ]] - then - fullpath="`which $command 2>&1`" -- -+ commandWithoutPath="`basename $command`" -+ - # does is exist? -- if [[ "`echo "$fullpath" |grep -c "no $command in"`" == "1" ]] -+ if [[ "`echo "$fullpath" |grep -c "no $commandWithoutPath in"`" == "1" ]] - then - if [[ "$command" != "alias" ]] # fedora uses something strange for 'which'.. - then diff --git a/sectool-0.7.4-filesystem.patch b/sectool-0.7.4-filesystem.patch deleted file mode 100644 index 4a5893f..0000000 --- a/sectool-0.7.4-filesystem.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/filesystem.c b/src/filesystem.c -index eab000f..c28901b 100644 ---- a/src/filesystem.c -+++ b/src/filesystem.c -@@ -48,14 +48,14 @@ struct envinit_t vars[]={ - * Error IDs - */ - #define ID_DIRWORLDW 1 --#define ID_FILEWORLDGROUPWX 2 -+#define ID_FILEGROUPWX 2 - #define ID_FILEWORLDW 3 - #define ID_GROUPNOTFOUND 4 - #define ID_NOPKG 5 - #define ID_SUIDSCRIPT 6 - #define ID_USERNOTFOUND 7 - #define ID_WRONGSYMLINK 8 -- -+#define ID_FILEWORLDWX 9 - - #define MAX_DIR_STACK_SIZE 16384 - -@@ -223,9 +223,12 @@ void check_object (const char *path, const struct stat *s) { - } - - /* executable and world/group writable */ -- if ((s->st_mode&(S_IXUSR|S_IXGRP|S_IXOTH)) && -- (s->st_mode&(S_IWGRP|S_IWOTH))) { -- report (WARNING, ID_FILEWORLDGROUPWX, "File \"%s\" is executable and world/group writable.\n", path); -+ if ((s->st_mode&(S_IXUSR|S_IXGRP|S_IXOTH))) { -+ if (s->st_mode&(S_IWOTH)) { -+ report (ERROR, ID_FILEWORLDWX, "File \"%s\" is executable and world writable.\n", path); -+ } else if (s->st_mode&(S_IWGRP)) { -+ report (WARNING, ID_FILEGROUPWX, "File \"%s\" is executable and group writable.\n", path); -+ } - } - - /* SUID script */ diff --git a/sectool.spec b/sectool.spec index 7f00f4e..036b466 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,13 +1,9 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.7.4 -Release: 3%{?dist} +Version: 0.7.5 +Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart - Source0: %{name}-%{version}.tar.bz2 -Patch1: sectool-0.7.4-filesystem.patch -Patch2: sectool-0.7.4-aliases.patch - License: GPLv2+ Group: Applications/System Requires: python2 gettext coreutils rpm-python @@ -34,8 +30,6 @@ sectool-gui provides a GTK-based graphical user interface to sectool. %prep %setup -q -%patch1 -p1 -b .filesystem -%patch2 -p1 -b .aliases %build make %{?_smp_mflags} @@ -97,11 +91,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu May 22 2008 Peter Vrabec - 0.7.4-3 -- fix aliases fullpath issue - -* Thu May 22 2008 Peter Vrabec - 0.7.4-2 -- filesystem: distinguish between world and group +w permission +* Mon May 26 2008 Peter Vrabec - 0.7.5-1 +- upgrade * Wed May 21 2008 Peter Vrabec - 0.7.4-1 - new upstream release, lots of fixes and improvements, diff --git a/sources b/sources index 01850ea..207bdb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd2c9dd80c237fc47f66c33b363ec01a sectool-0.7.4.tar.bz2 +610ddd0db313784a88000b79790e9a46 sectool-0.7.5.tar.bz2 From 9cee8b7f2e64e516eaf32fcb0d97ae69848d4024 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Fri, 6 Jun 2008 12:21:17 +0000 Subject: [PATCH 08/12] upgrade --- .cvsignore | 2 +- sectool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 008d7e8..550cc9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sectool-0.7.5.tar.bz2 +sectool-0.7.6.tar.bz2 diff --git a/sectool.spec b/sectool.spec index 036b466..c41569e 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,6 +1,6 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.7.5 +Version: 0.7.6 Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 06 2008 Peter Vrabec - 0.7.6-1 +- upgrade + * Mon May 26 2008 Peter Vrabec - 0.7.5-1 - upgrade diff --git a/sources b/sources index 207bdb6..733ed3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -610ddd0db313784a88000b79790e9a46 sectool-0.7.5.tar.bz2 +132008c0d0c88bd9e3573e674d5d5deb sectool-0.7.6.tar.bz2 From 59d10385f27b8c4bdbcfb68d0068819d3cdc1fc6 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Thu, 3 Jul 2008 10:09:46 +0000 Subject: [PATCH 09/12] upgrade --- .cvsignore | 2 +- sectool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 550cc9e..827347f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sectool-0.7.6.tar.bz2 +sectool-0.8.0.tar.bz2 diff --git a/sectool.spec b/sectool.spec index c41569e..b3bc3f7 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,6 +1,6 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.7.6 +Version: 0.8.0 Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 03 2008 Peter Vrabec - 0.8.0-1 +- upgrade + * Fri Jun 06 2008 Peter Vrabec - 0.7.6-1 - upgrade diff --git a/sources b/sources index 733ed3e..8353c88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -132008c0d0c88bd9e3573e674d5d5deb sectool-0.7.6.tar.bz2 +f6d96b2fff95ca973914f9a911848e19 sectool-0.8.0.tar.bz2 From 0a631b9c7390024f2574723feb8050665baceb90 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Thu, 24 Jul 2008 15:34:15 +0000 Subject: [PATCH 10/12] upgrade --- .cvsignore | 2 +- sectool.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 827347f..1fac123 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sectool-0.8.0.tar.bz2 +sectool-0.8.5.tar.bz2 diff --git a/sectool.spec b/sectool.spec index b3bc3f7..9d8a907 100644 --- a/sectool.spec +++ b/sectool.spec @@ -1,13 +1,13 @@ Summary: A security audit system and intrusion detection system Name: sectool -Version: 0.8.0 +Version: 0.8.5 Release: 1%{?dist} URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart Source0: %{name}-%{version}.tar.bz2 License: GPLv2+ Group: Applications/System Requires: python2 gettext coreutils rpm-python -BuildRequires: desktop-file-utils gettext intltool rpm-devel +BuildRequires: desktop-file-utils gettext intltool rpm-devel asciidoc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package gui @@ -42,8 +42,9 @@ desktop-file-install --delete-original \ --vendor=fedora \ $RPM_BUILD_ROOT%{_datadir}/applications/sectool.desktop #adjust paths in sectool.conf -sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf -sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf +sed -i 's,DSC_DIR=\(.*\),DSC_DIR=%{_sysconfdir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf +sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf +sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf #adjust icons path in guiOutput.py sed -i 's,__ico_path = \(.*\),__ico_path = "%{_datadir}/pixmaps/sectool/",' $RPM_BUILD_ROOT%{_datadir}/sectool/guiOutput.py @@ -59,8 +60,8 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) -%doc COPYING AUTHORS README -%config %{_sysconfdir}/sectool.conf +%doc COPYING AUTHORS README doc/tests_documentation.html +%config %{_sysconfdir}/sectool/ %dir %{_localstatedir}/lib/sectool %dir %{_datadir}/sectool %{_sbindir}/sectool @@ -91,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 24 2008 Peter Vrabec - 0.8.5-1 +- upgrade + * Thu Jul 03 2008 Peter Vrabec - 0.8.0-1 - upgrade diff --git a/sources b/sources index 8353c88..bd639f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6d96b2fff95ca973914f9a911848e19 sectool-0.8.0.tar.bz2 +3e155945378b8c44ea0bff85fb66f38b sectool-0.8.5.tar.bz2 From 30729cab3531e1d39441386fc575352df9ca00b9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:26 +0000 Subject: [PATCH 11/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 460a38b..0ab0e08 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: sectool -# $Id$ +# $Id: Makefile,v 1.1 2008/01/21 17:15:20 kevin Exp $ NAME := sectool SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9466c5ffe7e641a152c4a9825f14560cf6aacae5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:20:01 +0000 Subject: [PATCH 12/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0ab0e08..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: sectool -# $Id: Makefile,v 1.1 2008/01/21 17:15:20 kevin Exp $ -NAME := sectool -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9