Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index c2a04c30cfbb13f175c3e5c691d10cb00f806e7b..dbd1fcbf47f70a247141986f180cb869b629d395 100644 (file)
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_cloog_ppl = 1
 
 name       = gcc
 version    = 4.7.1
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Compilers
@@ -243,9 +243,10 @@ build
                EOF
                                ;;
                        *)
-                               ln -svf ../../../../../%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so
+                               ln -svf ../../../../..%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so
                                ;;
                esac
+               chmod 755 %{BUILDROOT}%{libdir}/libgcc_s.so.1
 
                # Remove some GNU debugger stuff.
                rm -vf %{BUILDROOT}%{libdir}/lib*.py
@@ -369,6 +370,7 @@ packages
                end
 
                provides = /lib/cpp
+               requires = gcc-c++ = %{thisver}
        end
 
        package libgcc

diff --git a/gettext/gettext.nm b/gettext/gettext.nm
index 3416a0a834f8602d34f344d63993d6fc3b171848..5a9f367d6bb560365f9cc7ee23c1b75589ea5e0a 100644 (file)
--- a/gettext/gettext.nm
+++ b/gettext/gettext.nm
@@ -5,7 +5,7 @@
 
 name       = gettext
 version    = 0.18.1.1
-release    = 7
+release    = 8
 
 groups     = System/Base
 url        = http://www.gnu.org/software/gettext/
@@ -51,6 +51,9 @@ build
                                chrpath -l ${i} && chrpath --delete ${i}
                        fi
                done
+
+               # Fix library permissions.
+               chmod 755 %{BUILDROOT}%{libdir}/preloadable_libintl.so
        end
 end
 

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index e5a6aa0ff8034753a30b2efaff4d72685cc65fc2..c9264c5181373133e9cfb9d203e727bec7cb5b84 100644 (file)
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
 
 name       = glibc
 version    = 2.15
-release    = 3
+release    = 4
 thisapp    = %{name}-2.15-a316c1f
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -233,6 +233,9 @@ build
 
                # Move some libs to correct place
                mv -v %{BUILDROOT}/%{lib}/lib{memusage,pcprofile}.so %{BUILDROOT}%{libdir}
+
+               # Fix library permissions.
+               chmod 755 %{BUILDROOT}%{libdir}/lib*.so*
        end
 
        keep_libraries

diff --git a/kmod/kmod.nm b/kmod/kmod.nm
index 4996d40701224a0b72031428347e1ac229d1b0da..3c80b72920f52ed671b6bdad2c37fc08143653ef 100644 (file)
--- a/kmod/kmod.nm
+++ b/kmod/kmod.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kmod
-version    = 7
-release    = 3
+version    = 9
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Kernel

diff --git a/nettle/nettle.nm b/nettle/nettle.nm
index af0a929e4e40f831354de09c64984f05d864efd7..df0e73a4aa50a0f1e6b2fd41a550cdf0e3a03345 100644 (file)
--- a/nettle/nettle.nm
+++ b/nettle/nettle.nm
@@ -5,7 +5,7 @@
 
 name       = nettle
 version    = 2.4
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.lysator.liu.se/~nisse/nettle/
@@ -34,6 +34,12 @@ build
        test
                make check
        end
+
+       install_cmds
+               # Fix library permissions.
+               chmod 755 %{BUILDROOT}%{libdir}/libhogweed.so.*
+               chmod 755 %{BUILDROOT}%{libdir}/libnettle.so.*
+       end
 end
 
 packages

diff --git a/pcre/pcre.nm b/pcre/pcre.nm
index 9615bb355c7ed194a4300b55cec38bf5909824a8..3493b619d33a6f8e15df6b96c07752cfb11ce608 100644 (file)
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@ -5,7 +5,7 @@
 
 name       = pcre
 version    = 8.30
-release    = 1
+release    = 2
 
 compat_version = 8.21
 
@@ -50,7 +50,7 @@ build
 
        install_cmds
                cd %{DIR_SRC}/%{name}-%{compat_version}
-               install -m 644 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir}
+               install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir}
                ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libprce.so.0
        end
 end

diff --git a/tcl/tcl.nm b/tcl/tcl.nm
index 11a9287727f7eb06fcb1663092075e9d0861993f..86eda72b8dd073a3a4e654fb1c0b58e994198550 100644 (file)
--- a/tcl/tcl.nm
+++ b/tcl/tcl.nm
@@ -6,7 +6,7 @@
 name       = tcl
 major_ver  = 8.5
 version    = %{major_ver}.11
-release    = 1
+release    = 2
 thisapp    = tcl%{version}
 
 groups     = Development/Languages
@@ -77,6 +77,9 @@ build
                # remove buildroot traces
                sed -i -e "s|$PWD/unix|%{libdir}|; s|$PWD|%{includedir}/%{name}-private|" %{BUILDROOT}%{libdir}/%{name}Config.sh
                rm -rf %{BUILDROOT}%{datadir}/%{name}%{major_ver}/ldAix
+
+               # Fix library permissions.
+               chmod 755 %{BUILDROOT}%{libdir}/libtcl*.so*
        end
 
        # Keep libtclstub*.a.