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 5c5249bcd96e2adb029ecae10107cb892d601c46 (commit) via be25f49efd61d3af5a372a67e113cbe69c08658d (commit) via 67bbd71ef18fbad900e4f33edabc97f4fe8397ff (commit) via 1f5bae3ae9857fbef6304c5a79614432f4f60615 (commit) via aa3b3b0fe7840ebcc724735be4ee00b7eddd2328 (commit) from 0f54968346962ab9b1fed900db53a6c896f13176 (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 5c5249bcd96e2adb029ecae10107cb892d601c46 Merge: be25f49 0f54968 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 30 01:05:53 2012 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit be25f49efd61d3af5a372a67e113cbe69c08658d Merge: 67bbd71 aa3b3b0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 30 01:05:45 2012 +0200
Merge remote-tracking branch 'stevee/psmisc'
commit 67bbd71ef18fbad900e4f33edabc97f4fe8397ff Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 30 01:04:54 2012 +0200
pakfire: Apply the patches in a better order.
Patches are now automatically applied in an order that is sorted by the version string of the package.
commit 1f5bae3ae9857fbef6304c5a79614432f4f60615 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 30 01:03:08 2012 +0200
nss: Add pkgconfig files for nss-util.
When the transition to one nss package has been made, the nss-util.pc files and nss-util-config was dropped. This results in a broken detection for libnssutil.
commit aa3b3b0fe7840ebcc724735be4ee00b7eddd2328 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Jun 25 18:43:57 2012 +0200
psmisc: Update t 22.19.
This is a bugfixing release.
-----------------------------------------------------------------------
Summary of changes: nss/{nss-config.in => nss-util-config.in} | 35 ++------------- nss/{nss.pc.in => nss-util.pc.in} | 8 ++-- nss/nss.nm | 48 +++++++++++-------- pakfire/pakfire.nm | 2 +- ...0009-Sort-patches-by-their-version-number.patch | 19 ++++++++ psmisc/psmisc.nm | 2 +- 6 files changed, 57 insertions(+), 57 deletions(-) copy nss/{nss-config.in => nss-util-config.in} (73%) copy nss/{nss.pc.in => nss-util.pc.in} (52%) create mode 100644 pakfire/patches/0009-Sort-patches-by-their-version-number.patch
Difference in files: diff --git a/nss/nss-util-config.in b/nss/nss-util-config.in new file mode 100644 index 0000000..ef8751d --- /dev/null +++ b/nss/nss-util-config.in @@ -0,0 +1,118 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <<EOF +Usage: nss-util-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--includedir[=DIR]] + [--libdir[=DIR]] + [--version] + [--libs] + [--cflags] +Dynamic Libraries: + nssutil +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +lib_nssutil=yes + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --includedir=*) + includedir=$optarg + ;; + --includedir) + echo_includedir=yes + ;; + --libdir=*) + libdir=$optarg + ;; + --libdir) + echo_libdir=yes + ;; + --version) + echo ${major_version}.${minor_version}.${patch_version} + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then + exec_prefix=`pkg-config --variable=exec_prefix nss-util` +fi +if test -z "$includedir"; then + includedir=`pkg-config --variable=includedir nss-util` +fi +if test -z "$libdir"; then + libdir=`pkg-config --variable=libdir nss-util` +fi + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then + echo $includedir +fi + +if test "$echo_libdir" = "yes"; then + echo $libdir +fi + +if test "$echo_cflags" = "yes"; then + echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then + libdirs="-Wl,-rpath-link,$libdir -L$libdir" + if test -n "$lib_nssutil"; then + libdirs="$libdirs -lnssutil${major_version}" + fi + echo $libdirs +fi + diff --git a/nss/nss-util.pc.in b/nss/nss-util.pc.in new file mode 100644 index 0000000..1310248 --- /dev/null +++ b/nss/nss-util.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS-UTIL +Description: Network Security Services Utility Library +Version: %NSSUTIL_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -L${libdir} -lnssutil3 +Cflags: -I${includedir} diff --git a/nss/nss.nm b/nss/nss.nm index 20acaf9..af0a2cf 100644 --- a/nss/nss.nm +++ b/nss/nss.nm @@ -8,7 +8,7 @@ ver_major = 3 ver_minor = 13 ver_patch = 1 version = %{ver_major}.%{ver_minor}.%{ver_patch} -release = 3 +release = 4
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Libraries @@ -146,29 +146,33 @@ build install -p -v -m 755 mozilla/dist/*.OBJ/bin/vfychain %{BUILDROOT}%{libdir}/nss/unsupported-tools chrpath --delete %{BUILDROOT}%{libdir}/nss/unsupported-tools/*
- sed -e "s,@libdir@,%{libdir},g" \ - -e "s,@prefix@,/usr,g" \ - -e "s,@exec_prefix@,/usr,g" \ - -e "s,@includedir@,/usr/include/nss3,g" \ - -e "s,@MOD_MAJOR_VERSION@,$(grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ - -e "s,@MOD_MINOR_VERSION@,$(grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ - -e "s,@MOD_PATCH_VERSION@,$(grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ - < %{DIR_SOURCE}/nss-config.in \ - > %{BUILDROOT}/usr/bin/nss-config - chmod -v 755 %{BUILDROOT}/usr/bin/nss-config + for file in nss-config nss-util-config; do + sed -e "s,@libdir@,%{libdir},g" \ + -e "s,@prefix@,/usr,g" \ + -e "s,@exec_prefix@,/usr,g" \ + -e "s,@includedir@,/usr/include/nss3,g" \ + -e "s,@MOD_MAJOR_VERSION@,$(grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + -e "s,@MOD_MINOR_VERSION@,$(grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + -e "s,@MOD_PATCH_VERSION@,$(grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + < %{DIR_SOURCE}/${file}.in \ + > %{BUILDROOT}/usr/bin/${file} + chmod -v 755 %{BUILDROOT}/usr/bin/${file} + done
install -p -v -m 755 %{DIR_SOURCE}/setup-nsssysinit.sh %{BUILDROOT}/usr/bin
# Generate file for pkg-config. - sed \ - -e "s,%libdir%,%{libdir},g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr,g" \ - -e "s,%includedir%,/usr/include/nss3,g" \ - -e "s,%NSS_VERSION%,%{version},g" \ - -e "s,%NSPR_VERSION%,$(nspr-config --version),g" \ - < %{DIR_SOURCE}/nss.pc.in \ - > %{BUILDROOT}%{libdir}/pkgconfig/nss.pc + for file in nss.pc nss-util.pc; do + sed \ + -e "s,%libdir%,%{libdir},g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr,g" \ + -e "s,%includedir%,/usr/include/nss3,g" \ + -e "s,%NSS_VERSION%,%{version},g" \ + -e "s,%NSPR_VERSION%,$(nspr-config --version),g" \ + < %{DIR_SOURCE}/${file}.in \ + > %{BUILDROOT}%{libdir}/pkgconfig/${file} + done
# Copy the include files we want cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3 @@ -201,6 +205,10 @@ packages nss=%{thisver} end
+ provides + nss-util-devel = %{thisver} + end + # Mozilla does no versioning :( files /usr/bin/*-config diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index eef125a..cba3786 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -5,7 +5,7 @@
name = pakfire version = 0.9.22 -release = 3 +release = 4
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Packaging diff --git a/pakfire/patches/0009-Sort-patches-by-their-version-number.patch b/pakfire/patches/0009-Sort-patches-by-their-version-number.patch new file mode 100644 index 0000000..a8756fc --- /dev/null +++ b/pakfire/patches/0009-Sort-patches-by-their-version-number.patch @@ -0,0 +1,19 @@ +commit 2d1d622ac9859c90363076aa2f44edf1efe53597 +Author: Michael Tremer michael.tremer@ipfire.org +Date: Tue Jun 26 19:32:11 2012 +0200 + + Sort patches by their version number (not in alphabetical order). + +diff --git a/macros/constants.macro b/macros/constants.macro +index 07459a3..74484ea 100644 +--- a/macros/constants.macro ++++ b/macros/constants.macro +@@ -11,7 +11,7 @@ DIR_SOURCE = %{BASEDIR} + + # By default, take all patches from the patches directory + # in alphabetical order. +-patches = $(find %{DIR_PATCHES} -not -type d 2>/dev/null | sort) ++patches = $(find %{DIR_PATCHES} -not -type d 2>/dev/null | sort --version-sort) + sources = %{thisapp}.tar.gz + + # Macro definitions diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm index af812f1..e86a9ff 100644 --- a/psmisc/psmisc.nm +++ b/psmisc/psmisc.nm @@ -4,7 +4,7 @@ ###############################################################################
name = psmisc -version = 22.15 +version = 22.19 release = 1
groups = Applications/System
hooks/post-receive -- IPFire 3.x development tree