pool/tomoyo-tools
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 88753 from security

Browse Source 
updated to 2.4.0-20110929

OBS-URL: https://build.opensuse.org/request/show/88753
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomoyo-tools?expand=0&rev=9
This commit is contained in:
Stephan Kulow 2011-10-21 14:43:54 +00:00 committed by Git OBS Bridge
commit dd7f3bda85
7 changed files with 29 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tomoyo-clone.patch
View File

@ -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 <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -29,7 +30,6 @@
#include <sys/file.h>
#include <syslog.h>
#include <time.h>
-#define _GNU_SOURCE
#include <sched.h>
#include <sys/mount.h>
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 <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -33,7 +34,6 @@
#include <poll.h>
#include <signal.h>
#include <dirent.h>
-#define _GNU_SOURCE
#include <sched.h>
#include <sys/mount.h>

3
tomoyo-tools-2.3.0-20110511.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b6e7dd6c2802da47c30b2934f04762d058b8313ffa6929ae886b8b49f3aa34c8
size 122880

3
tomoyo-tools-2.4.0-20110929.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c18efcfbbeb0cbcb509afff02e9b8681bf8e40fe952ae8a5025a6e66c743e856
size 166922

7
tomoyo-tools-2.4.0-20110929.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAk6EVdYACgkQUDraOEuXWpjcVwCeKID7RQ/Y9D0PkvUsSOAaqoYr
nIEAnA4uFBM/S0APXhjUzhcN72TYRE/V
=Jn8+
-----END PGP SIGNATURE-----

59
tomoyo-tools-makefile.patch
View File

@ -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);

8
tomoyo-tools.changes
View File

@ -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

34
tomoyo-tools.spec
View File

@ -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