From fe6bb4d7d377e6d6a3400b0ec8206e85b72b1260a5dc1c634b66dab8138b178a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 31 Aug 2011 09:09:12 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/tomoyo-tools revision 7.0 OBS-URL: https://build.opensuse.org/package/show/security/tomoyo-tools?expand=0&rev=e91351c363655c74141e517edf0fa7ec --- tomoyo-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomoyo-tools.spec b/tomoyo-tools.spec index 800490b..02315ed 100644 --- a/tomoyo-tools.spec +++ b/tomoyo-tools.spec @@ -26,7 +26,7 @@ AutoReqProv: on Summary: A Friendly Greeting Program Url: http://sourceforge.jp/projects/tomoyo/ Version: 2.3.0.20110511 -Release: 1 +Release: 81 Source0: http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/tomoyo-tools-%{downloadver}.tar.gz Patch0: %{name}-makefile.patch Patch1: tomoyo-clone.patch From ef6938a86475712714cea6f49d7b585544bd705d661f5ae87ba83a3dd14f1146 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 19 Oct 2011 15:05:29 +0000 Subject: [PATCH 2/2] Accepting request 88725 from home:msmeissn:branches:security updated to 2.4.0-20110929 OBS-URL: https://build.opensuse.org/request/show/88725 OBS-URL: https://build.opensuse.org/package/show/security/tomoyo-tools?expand=0&rev=11 --- tomoyo-clone.patch | 40 ----------------- tomoyo-tools-2.3.0-20110511.tar.gz | 3 -- tomoyo-tools-2.4.0-20110929.tar.gz | 3 ++ tomoyo-tools-2.4.0-20110929.tar.gz.asc | 7 +++ tomoyo-tools-makefile.patch | 59 -------------------------- tomoyo-tools.changes | 8 ++++ tomoyo-tools.spec | 34 +++++---------- 7 files changed, 29 insertions(+), 125 deletions(-) delete mode 100644 tomoyo-clone.patch delete mode 100644 tomoyo-tools-2.3.0-20110511.tar.gz create mode 100644 tomoyo-tools-2.4.0-20110929.tar.gz create mode 100644 tomoyo-tools-2.4.0-20110929.tar.gz.asc delete mode 100644 tomoyo-tools-makefile.patch diff --git a/tomoyo-clone.patch b/tomoyo-clone.patch deleted file mode 100644 index 41923a0..0000000 --- a/tomoyo-clone.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: tomoyo-tools/usr_lib_tomoyo/tomoyo-notifyd.c -=================================================================== ---- tomoyo-tools.orig/usr_lib_tomoyo/tomoyo-notifyd.c -+++ tomoyo-tools/usr_lib_tomoyo/tomoyo-notifyd.c -@@ -20,6 +20,7 @@ - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ -+#define _GNU_SOURCE - #include - #include - #include -@@ -29,7 +30,6 @@ - #include - #include - #include --#define _GNU_SOURCE - #include - #include - -Index: tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c -=================================================================== ---- tomoyo-tools.orig/usr_lib_tomoyo/tomoyo-editpolicy-agent.c -+++ tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c -@@ -20,6 +20,7 @@ - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ -+#define _GNU_SOURCE - #include - #include - #include -@@ -33,7 +34,6 @@ - #include - #include - #include --#define _GNU_SOURCE - #include - #include - diff --git a/tomoyo-tools-2.3.0-20110511.tar.gz b/tomoyo-tools-2.3.0-20110511.tar.gz deleted file mode 100644 index b958677..0000000 --- a/tomoyo-tools-2.3.0-20110511.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6e7dd6c2802da47c30b2934f04762d058b8313ffa6929ae886b8b49f3aa34c8 -size 122880 diff --git a/tomoyo-tools-2.4.0-20110929.tar.gz b/tomoyo-tools-2.4.0-20110929.tar.gz new file mode 100644 index 0000000..3d2b6f1 --- /dev/null +++ b/tomoyo-tools-2.4.0-20110929.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c18efcfbbeb0cbcb509afff02e9b8681bf8e40fe952ae8a5025a6e66c743e856 +size 166922 diff --git a/tomoyo-tools-2.4.0-20110929.tar.gz.asc b/tomoyo-tools-2.4.0-20110929.tar.gz.asc new file mode 100644 index 0000000..d67388b --- /dev/null +++ b/tomoyo-tools-2.4.0-20110929.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAk6EVdYACgkQUDraOEuXWpjcVwCeKID7RQ/Y9D0PkvUsSOAaqoYr +nIEAnA4uFBM/S0APXhjUzhcN72TYRE/V +=Jn8+ +-----END PGP SIGNATURE----- diff --git a/tomoyo-tools-makefile.patch b/tomoyo-tools-makefile.patch deleted file mode 100644 index 8693f42..0000000 --- a/tomoyo-tools-makefile.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: tomoyo-tools/usr_sbin/Makefile -=================================================================== ---- tomoyo-tools.orig/usr_sbin/Makefile -+++ tomoyo-tools/usr_sbin/Makefile -@@ -18,7 +18,7 @@ libtomoyotools.so: tomoyotools.c tomoyot - ln -sf libtomoyotools.so.1.0.1 libtomoyotools.so - - .c: -- $(CC) $(CFLAGS) -o $@ -ltomoyotools -L. $< -+ $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. - - tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so - $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON -Index: tomoyo-tools/sbin/Makefile -=================================================================== ---- tomoyo-tools.orig/sbin/Makefile -+++ tomoyo-tools/sbin/Makefile -@@ -5,7 +5,6 @@ all: $(BUILD_FILES) - install: all - mkdir -p $(INSTALLDIR)/sbin - chmod 700 $(BUILD_FILES) -- chown -R root:root . - cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/sbin/ - - .c: -Index: tomoyo-tools/usr_lib_tomoyo/Makefile -=================================================================== ---- tomoyo-tools.orig/usr_lib_tomoyo/Makefile -+++ tomoyo-tools/usr_lib_tomoyo/Makefile -@@ -2,11 +2,12 @@ BUILD_FILES = tomoyo-notifyd tomoyo-edit - - all: $(BUILD_FILES) - -+LIB=lib -+ - install: all -- mkdir -p $(INSTALLDIR)/usr/lib/tomoyo -- chmod 755 $(INSTALLDIR)/usr/lib/tomoyo -- chown -R root:root . -- cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/lib/tomoyo/ -+ mkdir -p $(INSTALLDIR)/usr/$(LIB)/tomoyo -+ chmod 755 $(INSTALLDIR)/usr/$(LIB)/tomoyo -+ cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/$(LIB)/tomoyo/ - - .c: - $(CC) $(CFLAGS) -o $@ $< -Index: tomoyo-tools/usr_sbin/editpolicy.h -=================================================================== ---- tomoyo-tools.orig/usr_sbin/editpolicy.h -+++ tomoyo-tools/usr_sbin/editpolicy.h -@@ -152,7 +152,7 @@ enum tomoyo_color_pair { - - #define CCS_HEADER_LINES 3 - --#define CCS_CONFIG_FILE "/usr/lib/tomoyo/tomoyotools.conf" -+#define CCS_CONFIG_FILE "/etc/tomoyotools.conf" - - int tomoyo_add_address_group_policy(char *data, const _Bool is_delete); - int tomoyo_add_number_group_policy(char *data, const _Bool is_delete); diff --git a/tomoyo-tools.changes b/tomoyo-tools.changes index 2477901..9180718 100644 --- a/tomoyo-tools.changes +++ b/tomoyo-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 19 13:26:11 UTC 2011 - meissner@suse.com + +- Updated to 2.4.0-20110929 snapshot necessary to work with 12.1 + - lots of bugfixes + - adjustments to current kernel + - auditing helps + ------------------------------------------------------------------- Mon Aug 29 11:34:54 UTC 2011 - aj@suse.de diff --git a/tomoyo-tools.spec b/tomoyo-tools.spec index 02315ed..bd27db0 100644 --- a/tomoyo-tools.spec +++ b/tomoyo-tools.spec @@ -16,44 +16,34 @@ # -%define downloadver 2.3.0-20110511 -BuildRequires: help2man ncurses-devel +%define downloadver 2.4.0-20110929 + +BuildRequires: ncurses-devel Name: tomoyo-tools License: GPLv2 Group: Development/Tools/Other AutoReqProv: on -Summary: A Friendly Greeting Program +Summary: Userspace tools for TOMOYO Linux 2.4.x Url: http://sourceforge.jp/projects/tomoyo/ -Version: 2.3.0.20110511 +Version: 2.4.0.20110929 Release: 81 -Source0: http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/tomoyo-tools-%{downloadver}.tar.gz -Patch0: %{name}-makefile.patch -Patch1: tomoyo-clone.patch +Source0: http://sourceforge.jp/frs/redir.php?f=/tomoyo/52848/tomoyo-tools-%{downloadver}.tar.gz +Source1: http://sourceforge.jp/frs/redir.php?f=/tomoyo/52848/tomoyo-tools-%{downloadver}.tar.gz.asc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -TOMOYO userland utilities. +This package contains userspace tools for administrating TOMOYO Linux 2.4. +Please see http://tomoyo.sourceforge.jp/2.4/ for documentation. %prep %setup -q -n %{name} -%patch0 -p1 -%patch1 -p1 %build -make CC="gcc $RPM_OPT_FLAGS" +make USRLIBDIR=%_libdir CFLAGS="-Wall $RPM_OPT_FLAGS" %install -make install INSTALLDIR=$RPM_BUILD_ROOT -if [ "%_lib" = "lib64" ]; then - mv $RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/lib64 -fi -mkdir $RPM_BUILD_ROOT/etc -mkdir $RPM_BUILD_ROOT/etc/tomoyo -mv $RPM_BUILD_ROOT/usr/%_lib/tomoyo/tomoyotools.conf $RPM_BUILD_ROOT/etc - -%clean -rm -rf $RPM_BUILD_ROOT +make INSTALLDIR=$RPM_BUILD_ROOT USRLIBDIR=%_libdir install %post -p /sbin/ldconfig @@ -62,13 +52,11 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %doc COPYING.tomoyo README.tomoyo -%dir /etc/tomoyo %attr(700,root,root) /sbin/tomoyo-init %_libdir/lib*.so* %dir %_libdir/tomoyo %_libdir/tomoyo/* /usr/sbin/* /usr/share/man/man8/* -%config(noreplace) /etc/tomoyotools.conf %changelog