diff options
-rw-r--r-- | sys-libs/libselinux/ChangeLog | 9 | ||||
-rw-r--r-- | sys-libs/libselinux/files/digest-libselinux-1.22-r1 | 1 | ||||
-rw-r--r-- | sys-libs/libselinux/files/digest-libselinux-1.28 | 1 | ||||
-rw-r--r-- | sys-libs/libselinux/files/libselinux-1.22.diff | 55 | ||||
-rw-r--r-- | sys-libs/libselinux/libselinux-1.28.ebuild (renamed from sys-libs/libselinux/libselinux-1.22-r1.ebuild) | 10 | ||||
-rw-r--r-- | sys-libs/libsemanage/Manifest | 4 | ||||
-rw-r--r-- | sys-libs/libsepol/ChangeLog | 8 | ||||
-rw-r--r-- | sys-libs/libsepol/files/digest-libsepol-1.10 | 1 | ||||
-rw-r--r-- | sys-libs/libsepol/files/digest-libsepol-1.4 | 1 | ||||
-rw-r--r-- | sys-libs/libsepol/libsepol-1.10.ebuild (renamed from sys-libs/libsepol/libsepol-1.4.ebuild) | 6 |
10 files changed, 29 insertions, 67 deletions
diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog index ac7d3e10cb94..391f6ec1592c 100644 --- a/sys-libs/libselinux/ChangeLog +++ b/sys-libs/libselinux/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-libs/libselinux # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.35 2005/09/09 02:56:27 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.36 2005/12/09 00:45:14 pebenito Exp $ + +*libselinux-1.28 (09 Dec 2005) + + 09 Dec 2005; Chris PeBenito <pebenito@gentoo.org> + -files/libselinux-1.22.diff, -libselinux-1.22-r1.ebuild, + +libselinux-1.28.ebuild: + New upstream release. 09 Sep 2005; Chris PeBenito <pebenito@gentoo.org> libselinux-1.24.ebuild: Mark stable. diff --git a/sys-libs/libselinux/files/digest-libselinux-1.22-r1 b/sys-libs/libselinux/files/digest-libselinux-1.22-r1 deleted file mode 100644 index cc35c44f474d..000000000000 --- a/sys-libs/libselinux/files/digest-libselinux-1.22-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 43b7640652d1fd85e6ab3df9b873ddd3 libselinux-1.22.tgz 81142 diff --git a/sys-libs/libselinux/files/digest-libselinux-1.28 b/sys-libs/libselinux/files/digest-libselinux-1.28 new file mode 100644 index 000000000000..c05515454d17 --- /dev/null +++ b/sys-libs/libselinux/files/digest-libselinux-1.28 @@ -0,0 +1 @@ +MD5 7e121e125b52913237df458ff610e983 libselinux-1.28.tgz 109236 diff --git a/sys-libs/libselinux/files/libselinux-1.22.diff b/sys-libs/libselinux/files/libselinux-1.22.diff deleted file mode 100644 index b6040c971c99..000000000000 --- a/sys-libs/libselinux/files/libselinux-1.22.diff +++ /dev/null @@ -1,55 +0,0 @@ ---- libselinux-1.22.orig/src/matchpathcon.c 2005-04-04 15:01:14.000000000 +0200 -+++ libselinux-1.22/src/matchpathcon.c 2005-04-04 15:01:23.000000000 +0200 -@@ -29,7 +29,10 @@ - - void set_matchpathcon_printf(void (*f)(const char *fmt, ...)) - { -- myprintf = f; -+ if (f) -+ myprintf = f; -+ else -+ myprintf = &default_printf; - } - - static int default_invalidcon(const char *path, unsigned lineno, char *context) -@@ -45,7 +48,10 @@ - - void set_matchpathcon_invalidcon(int (*f)(const char *p, unsigned l, char *c)) - { -- myinvalidcon = f; -+ if (f) -+ myinvalidcon = f; -+ else -+ myinvalidcon = &default_invalidcon; - } - - /* -@@ -324,6 +324,9 @@ - file_spec_t *fl, *tmp; - int h; - -+ if (!fl_head) -+ return; -+ - for (h = 0; h < HASH_BUCKETS; h++) { - fl = fl_head[h].next; - while (fl) { -diff -rNu libselinux-1.22.orig/utils/getconlist.c libselinux-1.22/utils/getconlist.c ---- libselinux-1.22.orig/utils/getconlist.c 2004-11-01 15:21:46.000000000 +0100 -+++ libselinux-1.22/utils/getconlist.c 2005-03-29 13:13:13.000000000 +0200 -@@ -38,10 +38,12 @@ - - /* Get the list and print it */ - ret = get_ordered_context_list(argv[1], cur_context, &list); -- for (i = 0; list[i]; i++) -- puts (list[i]); -+ if(ret != -1) { -+ for (i = 0; list[i]; i++) -+ puts (list[i]); -+ freeconary(list); -+ } - -- freeconary(list); - free(usercon); - - return 0; diff --git a/sys-libs/libselinux/libselinux-1.22-r1.ebuild b/sys-libs/libselinux/libselinux-1.28.ebuild index 7f2151d8a408..56745772547b 100644 --- a/sys-libs/libselinux/libselinux-1.22-r1.ebuild +++ b/sys-libs/libselinux/libselinux-1.28.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.22-r1.ebuild,v 1.2 2005/05/13 00:37:16 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.28.ebuild,v 1.1 2005/12/09 00:45:14 pebenito Exp $ IUSE="" +SEPOL_VER="1.10" + inherit eutils multilib DESCRIPTION="SELinux userland library" @@ -11,16 +13,14 @@ HOMEPAGE="http://www.nsa.gov/selinux" SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz" LICENSE="public-domain" SLOT="0" -KEYWORDS="x86 ppc sparc amd64 mips" +KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips" -DEPEND="virtual/libc" +DEPEND=">=sys-libs/libsepol-${SEPOL_VER}" src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/libselinux-1.22.diff - # make portage CFLAGS work sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/src/Makefile \ || die "src Makefile CFLAGS fix failed." diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest new file mode 100644 index 000000000000..4b77445dbd1f --- /dev/null +++ b/sys-libs/libsemanage/Manifest @@ -0,0 +1,4 @@ +MD5 c771eddce0f400613d6fa8eb27bd2826 ChangeLog 360 +MD5 20301b8fcf12252f5e0de0cbe2b4b135 files/digest-libsemanage-1.4 63 +MD5 f79369e08a6ce565fdc6b7e395077153 libsemanage-1.4.ebuild 1184 +MD5 77bbd07b4b596ae67c79079d2b13f3af metadata.xml 300 diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog index 45f619814b66..5c503b05991c 100644 --- a/sys-libs/libsepol/ChangeLog +++ b/sys-libs/libsepol/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/libsepol # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.10 2005/09/09 02:54:43 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.11 2005/12/09 00:41:20 pebenito Exp $ + +*libsepol-1.10 (09 Dec 2005) + + 09 Dec 2005; Chris PeBenito <pebenito@gentoo.org> -libsepol-1.4.ebuild, + +libsepol-1.10.ebuild: + New upstream release. 09 Sep 2005; Chris PeBenito <pebenito@gentoo.org> libsepol-1.6.ebuild: Mark stable. diff --git a/sys-libs/libsepol/files/digest-libsepol-1.10 b/sys-libs/libsepol/files/digest-libsepol-1.10 new file mode 100644 index 000000000000..7d291ef967a1 --- /dev/null +++ b/sys-libs/libsepol/files/digest-libsepol-1.10 @@ -0,0 +1 @@ +MD5 7111064eb5a21c4d49f2e8d5dc97e278 libsepol-1.10.tgz 136309 diff --git a/sys-libs/libsepol/files/digest-libsepol-1.4 b/sys-libs/libsepol/files/digest-libsepol-1.4 deleted file mode 100644 index 3fb81389aa4f..000000000000 --- a/sys-libs/libsepol/files/digest-libsepol-1.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 02321fa03a9ac562b8378f2337dbbe11 libsepol-1.4.tgz 59941 diff --git a/sys-libs/libsepol/libsepol-1.4.ebuild b/sys-libs/libsepol/libsepol-1.10.ebuild index 76f73dc15b24..5a70d4fc6eae 100644 --- a/sys-libs/libsepol/libsepol-1.4.ebuild +++ b/sys-libs/libsepol/libsepol-1.10.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-1.4.ebuild,v 1.4 2005/05/10 18:24:59 spb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-1.10.ebuild,v 1.1 2005/12/09 00:41:20 pebenito Exp $ IUSE="" inherit multilib -DESCRIPTION="SELinux binary policy management library" +DESCRIPTION="SELinux binary policy manipulation library" HOMEPAGE="http://www.nsa.gov/selinux" SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ppc sparc amd64 mips" +KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips" DEPEND="virtual/libc" |