[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f65e814e82f11cfbe7f98e96f52c22dc2f3310e8

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f65e814e82f11cfbe7f98e96f52c22dc2f3310e8

[git]

[-- Attachment #1: Type: text/plain, Size: 4191 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  f65e814e82f11cfbe7f98e96f52c22dc2f3310e8 (commit)
       via  08c532e264a808baa8294ac3c9289aaa5b2e2abb (commit)
      from  9ec021753659babcc03d08084c6652c230afd6c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f65e814e82f11cfbe7f98e96f52c22dc2f3310e8
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Oct 4 11:34:12 2016 +0200

    libsepol: Update to 2.5.
    
    This is a major update to the latest stable version of libsepol.
    
    * New build dependency: flex.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 08c532e264a808baa8294ac3c9289aaa5b2e2abb
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Oct 4 07:50:04 2016 +0200

    openjade: Fix FTBFS.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 libsepol/libsepol.nm                       | 14 ++++++++------
 openjade/openjade.nm                       |  2 +-
 openjade/patches/openjade-getoptperl.patch | 21 +++++++++++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 openjade/patches/openjade-getoptperl.patch

Difference in files:
diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm
index ac64781..951f76e 100644
--- a/libsepol/libsepol.nm
+++ b/libsepol/libsepol.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libsepol
-version    = 2.1.5
+version    = 2.5
 release    = 1
 
 groups     = System/Libraries
@@ -17,16 +17,21 @@ description
 	policies.
 end
 
-sources    = %{thisapp}.tgz
+source_dl  = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/
+sources    = %{thisapp}.tar.gz
 
 build
 	# Keep static libsepol.a for some selinux tools, that needs to link 
 	# against it. We will put it into an own package.
 	keep_libraries = %{libdir}/libsepol.a
 
+	requires
+		flex
+	end
+
 	build
 		make clean
-		make CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS}
+		make CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" %{PARALLELISMFLAGS}
 	end
 
 	# Install libraries to correct place.
@@ -40,9 +45,6 @@ build
 
 		# Remove manpages for binaries
 		rm -rf %{BUILDROOT}/usr/share/man/man8
-
-		# Fix bad symlink.
-		ln -svf libsepol.so.1 %{BUILDROOT}%{libdir}/libsepol.so
 	end
 end
 
diff --git a/openjade/openjade.nm b/openjade/openjade.nm
index 1e4fb16..d78fb31 100644
--- a/openjade/openjade.nm
+++ b/openjade/openjade.nm
@@ -5,7 +5,7 @@
 
 name       = openjade
 version    = 1.3.2
-release    = 3
+release    = 4
 
 groups     = Application/Text
 url        = http://openjade.sourceforge.net/
diff --git a/openjade/patches/openjade-getoptperl.patch b/openjade/patches/openjade-getoptperl.patch
new file mode 100644
index 0000000..0d835ea
--- /dev/null
+++ b/openjade/patches/openjade-getoptperl.patch
@@ -0,0 +1,21 @@
+diff -urNp openjade-1.3.2-orig/msggen.pl openjade-1.3.2/msggen.pl
+--- openjade-1.3.2-orig/msggen.pl	2002-10-20 23:47:23.000000000 +0200
++++ openjade-1.3.2/msggen.pl	2012-08-10 10:38:28.019081661 +0200
+@@ -4,6 +4,7 @@
+ # See the file COPYING for copying permission.
+ 
+ use POSIX;
++use Getopt::Std;
+ 
+ # Package and version.
+ $package = 'openjade';
+@@ -18,8 +19,7 @@ $gen_c = 0;
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+ 


hooks/post-receive
--
IPFire 3.x development tree