name = audit
version = 2.1.3
-release = 7
+release = 8
groups = System/Daemons
url = http://people.redhat.com/sgrubb/audit/
configure_options += \
--sysconfdir=/etc \
--sbindir=/sbin \
- --libdir=/lib \
+ --libdir=/%{lib} \
--without-prelude \
--without-libwrap \
--enable-gssapi-krb5=no \
autoreconf -fvi
end
- test
- make check
- end
-
install_cmds
- rm -vf %{BUILDROOT}/lib/libau{dit,parse}.so
- ln -svf ../../lib/libaudit.so.1 %{BUILDROOT}/usr/lib/libaudit.so
- ln -svf ../../lib/libauparse.so.0 %{BUILDROOT}/usr/lib/libauparse.so
+ rm -vf %{BUILDROOT}/%{lib}/libau{dit,parse}.so
+ ln -svf ../../%{lib}/libaudit.so.1 %{BUILDROOT}%{libdir}/libaudit.so
+ ln -svf ../../%{lib}/libauparse.so.0 %{BUILDROOT}%{libdir}/libauparse.so
mkdir -pv %{BUILDROOT}/usr/sbin/
mv -v %{BUILDROOT}/sbin/audisp*remote %{BUILDROOT}/usr/sbin/
package %{name}-devel
template DEVEL
+
+ # Just require the libs to link
+ # against them.
+ requires
+ %{name}-libs = %{thisver}
+ end
end
package python-%{name}
###############################################################################
name = automake
-version = 1.11.1
-release = 2
+version = 1.11.2
+release = 1
arch = noarch
groups = Development/Tools
summary = A GNU tool for automatically configuring source code.
description
- Automake is a tool for automatically generating Makefile.in \
+ Automake is a tool for automatically generating Makefile.in
files compliant with the GNU Coding Standards.
end
configure_options += \
--with-libtool \
- --sysconfdir=/etc \
- --localstatedir=/var \
--enable-threads \
--enable-ipv6 \
--with-pic \
--disable-static \
--disable-openssl-version-check \
--enable-exportlib \
- --with-export-libdir=/lib/ \
+ --with-export-libdir=/%{lib}/ \
--with-export-includedir=/usr/include/ \
--includedir=/usr/include/bind9/ \
- --with-pkcs11=/usr/lib/pkcs11/PKCS11_API.so \
+ --with-pkcs11=%{libdir}/pkcs11/PKCS11_API.so \
--with-gssapi=yes \
--disable-isc-spnego
gzip -9 doc/rfc/*
# Create directory layout.
- mkdir -pv %{BUILDROOT}/usr/lib/bind
+ mkdir -pv %{BUILDROOT}%{libdir}/bind
mkdir -pv %{BUILDROOT}/var/named/{slaves,data,dynamic}
mkdir -pv %{BUILDROOT}/usr/share/man/{man1,man5,man8}
mkdir -pv %{BUILDROOT}/run/named
install -m 644 %{DIR_SOURCE}/trusted-key.key %{BUILDROOT}/etc/trusted-key.key
# Recreate symlinks for export libraries
- rm -rf %{BUILDROOT}/lib/lib*-export.so
+ rm -rf %{BUILDROOT}/%{lib}/lib*-export.so
- ln -svf ../../lib/libdns-export.so.81 %{BUILDROOT}/usr/lib/libdns-export.so
- ln -svf ../../lib/libirs-export.so.80 %{BUILDROOT}/usr/lib/libirs-export.so
- ln -svf ../../lib/libisccfg-export.so.82 %{BUILDROOT}/usr/lib/libisccfg-export.so
- ln -svf ../../lib/libisc-export.so.83 %{BUILDROOT}/usr/lib/libisc-export.so
+ ln -svf ../../%{lib}/libdns-export.so.81 %{BUILDROOT}%{libdir}/libdns-export.so
+ ln -svf ../../%{lib}/libirs-export.so.80 %{BUILDROOT}%{libdir}/libirs-export.so
+ ln -svf ../../%{lib}/libisccfg-export.so.82 %{BUILDROOT}%{libdir}/libisccfg-export.so
+ ln -svf ../../%{lib}/libisc-export.so.83 %{BUILDROOT}%{libdir}/libisc-export.so
# Create /run/named.
mkdir -pv %{BUILDROOT}/run/named
###############################################################################
name = cracklib
-version = 2.8.12
-release = 2
+version = 2.8.18
+release = 1
groups = Security/Password
url = http://sourceforge.net/projects/cracklib/
in a dictionary.
end
-source_dl =
+source_dl = http://prdownloads.sourceforge.net/cracklib/
sources += cracklib-words-20080507.gz
build
requires
+ autoconf
+ automake
+ gettext-devel
python-devel
end
+ dictdir = %{datadir}/cracklib
+ dictpath = %{dictdir}/pw_dict
+
configure_options += \
--with-default-dict=/lib/cracklib/pw_dict \
--with-python \
# Only extract the source tarball.
prepare
cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/%{thisapp}.tar.gz
+ cd %{DIR_APP}
+
+ cp lib/packer.h lib/packer.h.in
+ chmod +x util/cracklib-format
# Apply all patches.
%{MACRO_PATCHES}
+
+ #autoreconf -fi
+
+ mkdir cracklib-dicts
+ cp -vf %{DIR_DL}/cracklib-words-20080507.gz cracklib-dicts
+
+ # Create distribution dict.
+ echo -ne "%{DISTRO_NAME}\n%{DISTRO_SNAME}\n" >> \
+ cracklib-dicts/cracklib-distro-words
+ gzip -9 cracklib-dicts/cracklib-distro-words
end
install_cmds
+ # Install python bindings
+ make install DESTDIR=%{BUILDROOT} INSTALL="install -c -p" -C python
+
mkdir -pv %{BUILDROOT}/{,usr/}%{lib}
mv -v %{BUILDROOT}%{libdir}/libcrack.so.2* %{BUILDROOT}/%{lib}
- ln -vsf ../../%{lib}/libcrack.so.2.8.0 %{BUILDROOT}%{libdir}/libcrack.so
-
- mkdir -pv %{BUILDROOT}/usr/share/dict
- install -v -m644 -D %{DIR_DL}/cracklib-words-20080507.gz \
- %{BUILDROOT}/usr/share/dict/cracklib-words.gz
- gunzip -v %{BUILDROOT}/usr/share/dict/cracklib-words.gz
- ln -v -s cracklib-words %{BUILDROOT}/usr/share/dict/words
- echo -ne "%{DISTRO_NAME}\n%{DISTRO_SNAME}\n" >> \
- %{BUILDROOT}/usr/share/dict/cracklib-extra-words
-
- mkdir -pv %{BUILDROOT}/lib/cracklib
- chmod a+x util/cracklib-{format,packer}
- util/cracklib-format \
- %{BUILDROOT}/usr/share/dict/cracklib-words \
- %{BUILDROOT}/usr/share/dict/cracklib-extra-words | \
- util/cracklib-packer \
- %{BUILDROOT}/lib/cracklib/pw_dict
+ ln -vsf ../../%{lib}/libcrack.so.2.8.1 %{BUILDROOT}%{libdir}/libcrack.so
+
+ mkdir -pv %{BUILDROOT}{%{dictdir},%{dictpath}}
+ util/cracklib-format cracklib-dicts/* | \
+ util/cracklib-packer %{BUILDROOT}%{dictpath}
+ util/cracklib-format %{BUILDROOT}%{dictdir}/cracklib-small | \
+ util/cracklib-packer %{BUILDROOT}%{dictdir}/cracklib-small
+ rm -f %{BUILDROOT}%{dictdir}/cracklib-small
+
+ sed -e "s@/usr/lib/cracklib_dict@%{dictpath}@g" lib/crack.h \
+ > %{BUILDROOT}%{includedir}/crack.h
+
+ ln -svf cracklib-format %{BUILDROOT}%{sbindir}/mkdict
+ ln -svf cracklib-packer %{BUILDROOT}%{sbindir}/packer
+
+ toprelpath=..
+ touch %{BUILDROOT}/top
+ while ! test -f %{BUILDROOT}%{libdir}/${toprelpath}/top; do
+ toprelpath=../${toprelpath}
+ done
+ rm -f %{BUILDROOT}/top
+
+ if [ "%{dictpath}" != "%{libdir}/cracklib_dict" ]; then
+ ln -svf ${toprelpath}%{dictpath}.hwm %{BUILDROOT}%{libdir}/cracklib_dict.hwm
+ ln -svf ${toprelpath}%{dictpath}.pwd %{BUILDROOT}%{libdir}/cracklib_dict.pwd
+ ln -svf ${toprelpath}%{dictpath}.pwi %{BUILDROOT}%{libdir}/cracklib_dict.pwi
+ fi
end
end
description = %{summary}
files
- /lib/cracklib
- /usr/share/dict*
+ %{dictdir}
+ %{dictpath}
end
end
--- /dev/null
+Newer autopoint chokes if we don't explicitly list a version here.
+diff -up cracklib-2.8.12/configure.in cracklib-2.8.12/configure.in
+--- cracklib-2.8.12/configure.in 2008-10-28 13:27:06.000000000 -0400
++++ cracklib-2.8.12/configure.in 2008-10-28 13:27:07.000000000 -0400
+@@ -58,7 +58,7 @@ AC_CHECK_FUNCS(strdup)
+ AC_CHECK_FUNCS(getpwuid_r)
+
+ dnl internationalization macros
+-AM_GNU_GETTEXT_VERSION
++AM_GNU_GETTEXT_VERSION(0.14)
+ AM_GNU_GETTEXT([external])
+
+ dnl Control default dictname
--- /dev/null
+Don't depend on a consumer of <packer.h> to be using autoconf, and to be
+checking for for the presence of <inttypes.h> and <stdint.h>, and including
+its own "config.h" before including <packer.h>, in order for this to be
+correct on 64-bit machines.
+
+diff -up cracklib-2.8.15/configure.in cracklib-2.8.15/configure.in
+--- cracklib-2.8.15/configure.in 2009-11-18 18:58:21.000000000 -0500
++++ cracklib-2.8.15/configure.in 2009-12-01 15:16:35.000000000 -0500
+@@ -26,6 +26,19 @@ AC_CHECK_HEADERS(zlib.h, AC_DEFINE(HAVE_
+
+ AC_SEARCH_LIBS(gzopen, z)
+
++if test x$ac_cv_header_inttypes_h = xyes ; then
++ CRACKLIB_INTEGER_TYPES1="#include <inttypes.h>"
++ CRACKLIB_INTEGER_TYPES2=
++elif test x$ac_cv_header_stdint_h = xyes ; then
++ CRACKLIB_INTEGER_TYPES1="#include <stdint.h>"
++ CRACKLIB_INTEGER_TYPES2=
++else
++ CRACKLIB_INTEGER_TYPES1="typedef unsigned int uint32_t;"
++ CRACKLIB_INTEGER_TYPES2="typedef unsigned short uint16_t;"
++fi
++AC_SUBST(CRACKLIB_INTEGER_TYPES1)
++AC_SUBST(CRACKLIB_INTEGER_TYPES2)
++
+ dnl Cygwin workaround
+ AC_MSG_CHECKING(if LINE_MAX is defined)
+ AC_EGREP_CPP(yes,
+@@ -92,5 +105,6 @@ AC_SUBST(CROSS_COMPILING, $cross_compili
+
+ AC_OUTPUT(util/Makefile lib/Makefile doc/Makefile python/Makefile Makefile \
+ python/setup.py \
++ lib/packer.h \
+ po/Makefile.in m4/Makefile dicts/Makefile cracklib.spec)
+
+diff -up cracklib-2.8.15/lib/packer.h.in cracklib-2.8.15/lib/packer.h.in
+--- cracklib-2.8.15/lib/packer.h.in 2009-12-01 15:15:38.000000000 -0500
++++ cracklib-2.8.15/lib/packer.h.in 2009-12-01 15:15:38.000000000 -0500
+@@ -30,17 +30,8 @@
+ #define _(String) (String)
+ #endif
+
+-#if defined(HAVE_INTTYPES_H)
+-#include <inttypes.h>
+-#else
+-#if defined(HAVE_STDINT_H)
+-#include <stdint.h>
+-#else
+-typedef unsigned int uint32_t;
+-typedef unsigned short uint16_t;
+-#endif
+-#endif
+-
++@CRACKLIB_INTEGER_TYPES1@
++@CRACKLIB_INTEGER_TYPES2@
+
+ struct pi_header
+ {
+@@ -83,6 +74,9 @@ typedef struct {
+ int dummy;
+ } PWDICT;
+
++@CRACKLIB_INTEGER_TYPES1@
++@CRACKLIB_INTEGER_TYPES2@
++
+ #endif
+
+ extern PWDICT *PWOpen(const char *prefix, char *mode);
name = cryptsetup-luks
version = 1.1.0
-release = 1
+release = 2
groups = System/Filesystems
url = http://cryptsetup.googlecode.com/
configure_options += \
--sbindir=/sbin \
- --libdir=/lib \
+ --libdir=/%{lib} \
--disable-static
install_cmds
- rm -rvf %{BUILDROOT}/lib/cryptsetup{,.la,.so}
- mkdir -pv %{BUILDROOT}/usr/lib
- mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
- ln -svf ../../lib/libcryptsetup.so.1 %{BUILDROOT}/usr/lib/libcryptsetup.so
+ rm -rvf %{BUILDROOT}/%{lib}/cryptsetup{,.la,.so}
+ mkdir -pv %{BUILDROOT}%{libdir}
+ mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
+ ln -svf ../../%{lib}/libcryptsetup.so.1 %{BUILDROOT}%{libdir}/libcryptsetup.so
end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
name = cyrus-sasl
version = 2.1.25
-release = 1
+release = 2
groups = System/Libraries
url = http://asg.web.cmu.edu/sasl/sasl-library.html
configure_options += \
--sysconfdir=/etc \
+ --with-configdir=%{libdir}/sasl2:/etc/sasl2 \
+ --with-plugindir=%{libdir}/sasl2 \
--with-dbpath=/var/lib/sasl/sasldb2 \
--with-saslauthd=/var/run/saslauthd \
--mandir=/usr/share/man
PARALLELISMFLAGS = # Disabled
+ make_install_targets += sasldir=%{libdir}/sasl2
+
install_cmds
- mkdir -pv %{BUILDROOT}/usr/lib/sasl2
- cp -vf %{DIR_SOURCE}/smtpd.conf %{BUILDROOT}/usr/lib/sasl2/
+ # Install plugins.
+ make install DESTDIR=%{BUILDROOT} sasldir=%{libdir}/sasl2 -C plugins
+
+ mkdir -pv %{BUILDROOT}%{libdir}/sasl2
+ cp -vf %{DIR_SOURCE}/smtpd.conf %{BUILDROOT}%{libdir}/sasl2/
install -v -m700 -d %{BUILDROOT}/var/lib/sasl %{BUILDROOT}/var/run/saslauthd
end
packages
package %{name}
- end
package %{name}-libs
template LIBS
name = dbus-glib
version = 0.94
-release = 1
+release = 2
groups = System/Libraries
url = http://www.freedesktop.org/software/dbus/
configure_options += \
--sysconfdir=/etc \
- --libdir=/lib \
- --libexecdir=/usr/lib \
+ --libdir=/%{lib} \
+ --libexecdir=%{libdir} \
--mandir=/usr/share/man
test
end
install_cmds
- mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
+ mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
- rm -vf %{BUILDROOT}/lib/libdbus-glib-1.so
- ln -svf ../../lib/libdbus-glib-1.so.2 %{BUILDROOT}/usr/lib/libdbus-glib-1.so
+ rm -vf %{BUILDROOT}/%{lib}/libdbus-glib-1.so
+ ln -svf ../../%{lib}/libdbus-glib-1.so.2 %{BUILDROOT}%{libdir}/libdbus-glib-1.so
end
end
###############################################################################
name = dbus
-version = 1.4.14
+version = 1.4.16
release = 2
groups = System/Daemons
requires
audit-devel
expat-devel
+ libcap-ng-devel
libselinux-devel
end
configure_options += \
--sysconfdir=/etc \
--localstatedir=/var \
- --libdir=/lib \
- --libexecdir=/lib \
+ --libdir=/%{lib} \
+ --libexecdir=/%{lib} \
--enable-libaudit \
--enable-selinux=yes \
--with-systemdsystemunitdir=/lib/systemd/system/ \
--with-dbus-user=dbus
install_cmds
- mkdir -pv %{BUILDROOT}/usr/lib
- mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
+ mkdir -pv %{BUILDROOT}%{libdir}
+ mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
#change the arch-deps.h include directory to /usr/lib instead of /lib
- sed -e 's@-I${libdir}@-I${prefix}/lib@' -i %{BUILDROOT}/usr/lib/pkgconfig/dbus-1.pc
+ sed -e 's@-I${libdir}@-I${prefix}/%{lib}@' -i %{BUILDROOT}%{libdir}/pkgconfig/dbus-1.pc
- mkdir -pv %{BUILDROOT}/usr/lib/dbus-1.0/include
- mv -v %{BUILDROOT}/lib/dbus-1.0/include/* %{BUILDROOT}/usr/lib/dbus-1.0/include
- rm -rvf %{BUILDROOT}/lib/dbus-1.0
+ mkdir -pv %{BUILDROOT}%{libdir}/dbus-1.0/include
+ mv -v %{BUILDROOT}/%{lib}/dbus-1.0/include/* %{BUILDROOT}%{libdir}/dbus-1.0/include
+ rm -rvf %{BUILDROOT}/%{lib}/dbus-1.0
- rm -vf %{BUILDROOT}/lib/libdbus-1.so
- ln -svf ../../lib/libdbus-1.so.3 %{BUILDROOT}/usr/lib/libdbus-1.so
+ rm -vf %{BUILDROOT}/%{lib}/libdbus-1.so
+ ln -svf ../../%{lib}/libdbus-1.so.3 %{BUILDROOT}%{libdir}/libdbus-1.so
end
end
--- /dev/null
+--- dev86-0.16.17/bcc/bcc.c.fix 2005-01-03 23:41:55.000000000 +0100
++++ dev86-0.16.17/bcc/bcc.c 2006-12-27 16:32:57.000000000 +0100
+@@ -226,12 +226,12 @@
+
+ } else {
+ /* Relative paths to normal PREFIX directory */
+- default_include = build_libpath("-I", "/lib/bcc/include", "");
+- default_libdir = build_libpath("-L", "/lib/bcc", libdir_suffix);
+- optim_rules = build_libpath("-d", "/lib/bcc", libdir_suffix);
++ default_include = build_libpath("-I", "/lib64/bcc/include", "");
++ default_libdir = build_libpath("-L", "/lib64/bcc", libdir_suffix);
++ optim_rules = build_libpath("-d", "/lib64/bcc", libdir_suffix);
+
+- build_prefix("/lib/bcc", libdir_suffix, "");
+- build_prefix("/lib/bcc", "", "");
++ build_prefix("/lib64/bcc", libdir_suffix, "");
++ build_prefix("/lib64/bcc", "", "");
+ }
+
+ build_prefix("/bin", "", "");
name = dev86
version = 0.16.18
-release = 2
+release = 3
maintainer = Ben Schweikert <ben.schweikert@ipfire.org>
groups = Development/Languages
ncurses-devel
end
+ prepare_cmds
+ if [ "$(uname -m)" = "x86_64" ]; then
+ patch -Np1 -i %{DIR_SOURCE}/dev86-64bit.patch
+ fi
+ end
+
build
make bcc86 unproto copt as86 ld86 CFLAGS="%{CFLAGS}"
make -C cpp CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS}
make_install_targets = \
DIST=%{BUILDROOT} \
MANDIR=/usr/share/man \
- LIBDIR=/usr/lib/bcc \
+ LIBDIR=%{libdir}/bcc \
INCLDIR=/usr/include/bcc \
LOCLAPREFIX=/usr \
install install-man
--- /dev/null
+diff -up dev86-0.16.17/ld/x86_aout.h.long dev86-0.16.17/ld/x86_aout.h
+--- dev86-0.16.17/ld/x86_aout.h.long 2003-01-28 23:17:14.000000000 +0100
++++ dev86-0.16.17/ld/x86_aout.h 2009-02-19 11:37:10.000000000 +0100
+@@ -11,10 +11,11 @@
+ /* If the host isn't an x86 all bets are off, use chars. */
+ #if defined(i386) || defined(__BCC__) || defined(MSDOS)
+ typedef long Long;
+-#define __OUT_OK 1
+ #else
+-typedef char Long[4];
++#include <stdint.h>
++typedef int32_t Long;
+ #endif
++#define __OUT_OK 1
+
+ struct exec { /* a.out header */
+ unsigned char a_magic[2]; /* magic number */
--- /dev/null
+--- dev86-0.16.17/makefile.in.nostrip 2007-01-30 14:28:38.000000000 +0100
++++ dev86-0.16.17/makefile.in 2007-01-30 14:40:56.000000000 +0100
+@@ -78,7 +78,7 @@
+
+ # Install files with the userid of the currently running process.
+ INDAT=-m 644
+-INEXE=-m 755 -s
++INEXE=-m 755
+ INSCR=-m 755
+
+ #ifdef __CYGWIN__
name = dmraid
version = 1.0.0.rc15
-release = 2
+release = 3
groups = System/Filesystems
url = http://people.redhat.com/heinzm/sw/dmraid
configure_options += \
--sbindir=/sbin \
- --libdir=/lib \
+ --libdir=/%{lib} \
--disable-static \
--disable-static_link \
--enable-libselinux
end
install_cmds
- mkdir -pv %{BUILDROOT}/{,usr}/lib
+ mkdir -pv %{BUILDROOT}/{,usr}/%{lib}
install -v -m 755 lib/libdmraid.so \
- %{BUILDROOT}/lib/libdmraid.so.%{version}
- ln -svf ../../lib/libdmraid.so.%{version} %{BUILDROOT}/usr/lib/libdmraid.so
+ %{BUILDROOT}/%{lib}/libdmraid.so.%{version}
+ ln -svf ../../%{lib}/libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so
# Install development headers.
- install -m 644 include/dmraid/*.h %{BUILDROOT}/usr/include/dmraid/
+ mkdir -pv %{BUILDROOT}%{includedir}/dmraid
+ install -m 644 include/dmraid/*.h %{BUILDROOT}%{includedir}/dmraid/
end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
sgml-common
end
- prerequires +=\
- docbook-dtds \
- libxml2 \
+ prerequires
+ docbook-dtds
+ libxml2
sgml-common
+ end
script postin
# Install catalog files.
name = docbook-dtds
version = 1.0
-release = 3
+release = 4
arch = noarch
groups = Applications/Text
packages
package %{name}
-
- prerequires += \
- libxml2 \
+ prerequires
+ libxml2
sgml-common
+ end
script postin
# Install catalog files.
name = docbook-utils
version = 0.6.14
-release = 1
+release = 2
groups = Applications/Text
url = http://sources.redhat.com/docbook-tools/
end
configure_options += \
- --libdir=/usr/lib \
+ --libdir=%{libdir} \
--mandir=/usr/share/man
end
docbook-dtds
docbook-dsssl
openjade
+ perl-SGMLSpm
end
end
name = docbook-xsl
version = 1.76.1
-release = 2
+release = 3
arch = noarch
groups = Applications/Text
sgml-common
end
- prerequires +=\
- docbook-dtds \
- libxml2 \
+ prerequires
+ docbook-dtds
+ libxml2
sgml-common
+ end
script postin
# Install catalog files.
name = e2fsprogs
version = 1.41.11
-release = 1
+release = 2
groups = System/Filesystems
url = http://e2fsprogs.sourceforge.net/
install
cd build
make install install-libs DESTDIR=%{BUILDROOT}
-
- ln -svf ../../lib/libcom_err.so.2 %{BUILDROOT}/usr/lib/libcom_err.so
- ln -svf ../../lib/libe2p.so.2 %{BUILDROOT}/usr/lib/libe2p.so
- ln -svf ../../lib/libext2fs.so.2 %{BUILDROOT}/usr/lib/libext2fs.so
- ln -svf ../../lib/libss.so.2 %{BUILDROOT}/usr/lib/libss.so
end
end
name = gettext
version = 0.18.1.1
-release = 4
+release = 6
groups = System/Base
url = http://www.gnu.org/software/gettext/
--enable-shared \
--disable-rpath
-# Disable testsuite - it's broken ( readlink test )
-# test
-# make check
-# end
+ test
+ make check
+ end
install_cmds
# cleanup rpaths
packages
package %{name}
+ package %{name}-common-devel
+ summary = Common development files for gettext.
+ description = %{summary}
+ arch = noarch
+
+ files
+ /usr/share/gettext/
+ end
+ end
+
package %{name}-devel
template DEVEL
requires
+ gettext-common-devel=%{thisver}
gettext-libs=%{thisver}
end
+
+ files += \
+ /usr/bin/autopoint \
+ /usr/share/man/man1/autopoint.1
end
package %{name}-libs
--- /dev/null
+diff -U 3 -p -r gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-areadlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.h
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-areadlink.h 2010-02-16 16:32:26.000000000 -0500
++++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.h 2011-08-31 16:16:26.325521167 -0400
+@@ -36,7 +36,7 @@ test_areadlink (char * (*func) (char con
+ ASSERT (errno == ENOENT);
+ errno = 0;
+ ASSERT (func ("", 1) == NULL);
+- ASSERT (errno == ENOENT);
++ ASSERT (errno == ENOENT || errno == EINVAL);
+ errno = 0;
+ ASSERT (func (".", 1) == NULL);
+ ASSERT (errno == EINVAL);
+diff -U 3 -p -r gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-readlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.h
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-readlink.h 2011-08-31 15:54:15.000000000 -0400
++++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.h 2011-08-31 16:16:09.325165556 -0400
+@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
+ ASSERT (errno == ENOENT);
+ errno = 0;
+ ASSERT (func ("", buf, sizeof buf) == -1);
+- ASSERT (errno == ENOENT);
++ ASSERT (errno == ENOENT || errno == EINVAL);
+ errno = 0;
+ ASSERT (func (".", buf, sizeof buf) == -1);
+ ASSERT (errno == EINVAL);
name = ghostscript
version = 9.04
-release = 1
+release = 3
groups = Applications/Printing
url = http://ghostscript.com
###############################################################################
name = git
-version = 1.7.3.2
+version = 1.7.8.2
release = 1
groups = Development/Tools
and full access to internals.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://git-core.googlecode.com/files/
build
requires
name = libaio
version = 0.3.109
-release = 1
+release = 2
groups = System/Libraries
url = ftp://ftp.kernel.org/pub/linux/libs/aio/
build
make %{PARALLELISMFLAGS} \
- CFLAGS="%{CFLAGS} -I." CC="gcc"
+ CFLAGS="%{CFLAGS} -I. -fPIC" CC="gcc"
end
+ make_install_targets += prefix=/ libdir=%{libdir} usrlibdir=%{libdir}
+
install_cmds
# Modify links to be relative
- ln -svf libaio.so.1 %{BUILDROOT}/usr/lib/libaio.so
- ln -svf libaio.so.1.0.1 %{BUILDROOT}/usr/lib/libaio.so.1
+ ln -svf libaio.so.1 %{BUILDROOT}%{libdir}/libaio.so
+ ln -svf libaio.so.1.0.1 %{BUILDROOT}%{libdir}/libaio.so.1
end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
name = libgcrypt
version = 1.5.0
-release = 1
+release = 2
groups = System/Libraries
url = http://www.gnupg.org/
end
configure_options += \
- --libdir=/lib \
+ --libdir=/%{lib} \
--enable-noexecstack \
install_cmds
- mkdir -pv %{BUILDROOT}/usr/lib
- rm -vf %{BUILDROOT}/lib/libgcrypt.so
- ln -sfv ../../lib/libgcrypt.so.11 %{BUILDROOT}/usr/lib/libgcrypt.so
+ mkdir -pv %{BUILDROOT}%{libdir}
+ rm -vf %{BUILDROOT}/%{lib}/libgcrypt.so
+ ln -sfv ../../%{lib}/libgcrypt.so.11 %{BUILDROOT}%{libdir}/libgcrypt.so
end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
name = libgpg-error
version = 1.9
-release = 1
+release = 2
groups = System/Libraries
url = http://www.gnupg.org/
end
configure_options += \
- --libdir=/lib
+ --libdir=/%{lib}
install_cmds
- mkdir -pv %{BUILDROOT}/usr/lib
- rm -vf %{BUILDROOT}/lib/libgpg-error.so
- ln -sfv ../../lib/libgpg-error.so.0 %{BUILDROOT}/usr/lib/libgpg-error.so
+ mkdir -pv %{BUILDROOT}%{libdir}
+ rm -vf %{BUILDROOT}/%{lib}/libgpg-error.so
+ ln -sfv ../../%{lib}/libgpg-error.so.0 %{BUILDROOT}%{libdir}/libgpg-error.so
end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
# Copyright (C) - IPFire Development Team <info@ipfire.org> #
###############################################################################
-name = libjpeg-turbo
-version = 1.0.0
+name = libjpeg
+version = 1.1.1
release = 1
+thisapp = libjpeg-turbo-%{version}
groups = System/Libraries
url = http://sourceforge.net/projects/libjpeg-turbo
text comments into a JPEG file.
end
-source_dl =
-sources = %{name}-%{version}.tar.gz
+source_dl = http://sourceforge.net/projects/libjpeg-turbo/files/%{version}/
build
requires
prepare_cmds
autoreconf -vfi
end
-
- install_cmds
- # Remove non-versioned libjpegturbo.
- rm -vf %{BUILDROOT}/usr/include/turbojpeg.h
- rm -vf %{BUILDROOT}/usr/lib/libturbojpeg.so
- end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
+
+ files += !/usr/lib/libturbojpeg.so
end
package %{name}-debuginfo
name = libnl
version = 1.1
-release = 1
+release = 2
groups = Development/Libraries
url = http://people.suug.ch/~tgr/libnl/
build
configure_options += \
- --libdir=/lib
+ --libdir=/%{lib}
install_cmds
- rm -vf %{BUILDROOT}/lib/libnl.so
- mkdir -pv %{BUILDROOT}/usr/lib
- ln -svf ../../lib/libnl.so.1 %{BUILDROOT}/usr/lib/libnl.so
+ rm -vf %{BUILDROOT}/%{lib}/libnl.so
+ mkdir -pv %{BUILDROOT}%{libdir}
+ ln -svf ../../%{lib}/libnl.so.1 %{BUILDROOT}%{libdir}/libnl.so
- mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/pkgconfig
+ mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}/pkgconfig
end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
###############################################################################
name = libtiff
-version = 4.0.0beta7
-release = 1
+version = 4.0.0
+release = 2
+thisapp = tiff-%{version}
groups = System/Libraries
-url = http://www.libtiff.org
+url = http://www.remotesensing.org/libtiff/
license = libtiff ( own )
summary = Library of functions for manipulating TIFF format image files.
description
- The libtiff package contains a library of functions for manipulating \
- TIFF (Tagged Image File Format) image format files. TIFF is a widely \
- used file format for bitmapped images. TIFF files usually end in the \
+ The libtiff package contains a library of functions for manipulating
+ TIFF (Tagged Image File Format) image format files. TIFF is a widely
+ used file format for bitmapped images. TIFF files usually end in the
.tif extension and they are often quite large.
end
-source_dl =
-sources = tiff-%{version}.tar.gz
+source_dl = ftp://ftp.remotesensing.org/pub/libtiff/
build
requires
libjpeg-devel
end
- DIR_APP = /usr/src/tiff-%{version}
-
configure_options += \
--enable-defer-strile-load \
--enable-chunky-strip-read
packages
package %{name}
- end
package %{name}-devel
template DEVEL
# Copyright (C) - IPFire Development Team <info@ipfire.org> #
###############################################################################
-name = libusb
+name = libusb-compat
version = 0.1.12
-release = 1
+release = 2
+thisapp = libusb-%{version}
groups = System/Libraries
url = http://sourceforge.net/projects/libusb/
end
configure_options += \
- --libdir=/lib \
+ --libdir=/%{lib} \
--disable-build-docs \
--disable-static
install_cmds
- mkdir -pv %{BUILDROOT}/usr/lib
- mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
-
- rm -vf %{BUILDROOT}/usr/lib/libusb{,pp}-0.1.so
- ln -svf ../../lib/libusb-0.1.so.4 %{BUILDROOT}/usr/lib/libusb.so
- ln -svf ../../lib/libusb-0.1.so.4 %{BUILDROOT}/usr/lib/libusb-0.1.so
- ln -svf ../../lib/libusbpp-0.1.so.4 %{BUILDROOT}/usr/lib/libusbpp.so
- ln -svf ../../lib/libusbpp-0.1.so.4 %{BUILDROOT}/usr/lib/libusbpp-0.1.so
+ mkdir -pv %{BUILDROOT}%{libdir}
+ mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
+
+ rm -vf %{BUILDROOT}%{libdir}/libusb{,pp}-0.1.so
+ ln -svf ../../%{lib}/libusb-0.1.so.4 %{BUILDROOT}%{libdir}/libusb.so
+ ln -svf ../../%{lib}/libusb-0.1.so.4 %{BUILDROOT}%{libdir}/libusb-0.1.so
+ ln -svf ../../%{lib}/libusbpp-0.1.so.4 %{BUILDROOT}%{libdir}/libusbpp.so
+ ln -svf ../../%{lib}/libusbpp-0.1.so.4 %{BUILDROOT}%{libdir}/libusbpp-0.1.so
end
end
packages
- package %{name}-compat
- end
+ package %{name}
- package %{name}-compat-devel
+ package %{name}-devel
template DEVEL
end
###############################################################################
name = libxml2
-version = 2.7.7
+version = 2.7.8
release = 1
groups = System/Libraries
library.
end
-source_dl =
+source_dl = ftp://xmlsoft.org/libxml2/
build
requires
###############################################################################
name = lighttpd
-version = 1.4.29
+version = 1.4.30
ver_major = 1.4
release = 2
end
configure_options += \
- --libdir=/usr/lib/%{name} \
+ --libdir=%{libdir}/%{name} \
--with-ldap \
--with-openssl
/etc/lighttpd.conf
end
- prerequires = shadow-utils systemd-units
+ prerequires
+ shadow-utils
+ systemd-units
+ end
script prein
%{create_user}
# Copyright (C) - IPFire Development Team <info@ipfire.org> #
###############################################################################
-name = LVM2
+name = lvm2
version = 2.02.54
-release = 1
+release = 2
+thisapp = LVM2.%{version}
groups = System/Base
url = http://sources.redhat.com/lvm2/
(kind of logical partitions) in volume groups.
end
-thisapp = %{name}.%{version}
-
source_dl =
sources = %{thisapp}.tgz
--bindir=/bin \
--sbindir=/sbin \
--exec-prefix=/ \
- --libdir=/lib \
+ --libdir=/%{lib} \
--enable-pkgconfig
install_cmds
- mkdir -pv %{BUILDROOT}/usr/lib
- rm -vf %{BUILDROOT}/lib/libdevmapper.so
- ln -svf libdevmapper.so.1.02 %{BUILDROOT}/lib/libdevmapper.so.1
- ln -svf ../../lib/libdevmapper.so.1 %{BUILDROOT}/usr/lib/libdevmapper.so
+ mkdir -pv %{BUILDROOT}%{libdir}
+ rm -vf %{BUILDROOT}/%{lib}/libdevmapper.so
+ ln -svf libdevmapper.so.1.02 %{BUILDROOT}/%{lib}/libdevmapper.so.1
+ ln -svf ../../%{lib}/libdevmapper.so.1 %{BUILDROOT}%{libdir}/libdevmapper.so
end
end
packages
package %{name}
- end
package libdevmapper
template LIBS
name = mstpd
version = 0.01
svn_ver = 22
-release = 0.3-svn%{svn_ver}.1
+release = 0.3-svn%{svn_ver}.2
thisapp = %{name}-%{version}-svn%{svn_ver}
groups = Networking/Tools
--- /dev/null
+Index: bridge_ctl.h
+===================================================================
+--- bridge_ctl.h (revision 22)
++++ bridge_ctl.h (revision 27)
+@@ -37,7 +37,7 @@
+ __u8 macaddr[ETH_ALEN];
+ char name[IFNAMSIZ];
+
+- bool up, stp_up;
++ bool up;
+ } sysdep_br_data_t;
+
+ typedef struct
+Index: bridge-stp
+===================================================================
+--- bridge-stp (revision 22)
++++ bridge-stp (revision 27)
+@@ -44,12 +44,12 @@
+ checkpid $pid_file || exit 1
+ for b in $MSTP_BRIDGES; do
+ if [ "$bridge" == "$b" ]; then
+- exec /sbin/mstpctl notify-daemon-that-stp-is-on $bridge
++ exec /sbin/mstpctl addbridge $bridge
+ fi
+ done
+ exit 1 ;;
+ stop)
+- exec /sbin/mstpctl notify-daemon-that-stp-is-off $bridge
++ exec /sbin/mstpctl delbridge $bridge
+ ;;
+ *)
+ echo "Unknown action:" $2
+Index: ctl_functions.h
+===================================================================
+--- ctl_functions.h (revision 22)
++++ ctl_functions.h (revision 27)
+@@ -448,23 +448,16 @@
+ #define set_fids2mstids_CALL (in->br_index, in->fids2mstids)
+ CTL_DECLARE(set_fids2mstids);
+
+-/* stp_mode_notification */
+-#define CMD_CODE_stp_mode_notification (122 | RESPONSE_FIRST_HANDLE_LATER)
+-#define stp_mode_notification_ARGS (int br_index, bool on)
+-struct stp_mode_notification_IN
+-{
+- int br_index;
+- bool on;
+-};
+-struct stp_mode_notification_OUT
+-{
+-};
+-#define stp_mode_notification_COPY_IN ({ in->br_index = br_index; \
+- in->on = on; })
+-#define stp_mode_notification_COPY_OUT ({ (void)0; })
+-#define stp_mode_notification_CALL (in->br_index, in->on)
+-CTL_DECLARE(stp_mode_notification);
++/* add bridges */
++#define CMD_CODE_add_bridges (122 | RESPONSE_FIRST_HANDLE_LATER)
++#define add_bridges_ARGS (int *br_array, int* *ifaces_lists)
++CTL_DECLARE(add_bridges);
+
++/* delete bridges */
++#define CMD_CODE_del_bridges (123 | RESPONSE_FIRST_HANDLE_LATER)
++#define del_bridges_ARGS (int *br_array)
++CTL_DECLARE(del_bridges);
++
+ /* General case part in ctl command server switch */
+ #define SERVER_MESSAGE_CASE(name) \
+ case CMD_CODE_ ## name : do \
+Index: bridge_track.c
+===================================================================
+--- bridge_track.c (revision 22)
++++ bridge_track.c (revision 27)
+@@ -175,27 +175,11 @@
+ }
+ }
+
+-static bool stp_enabled(bridge_t * br)
++static void set_br_up(bridge_t * br, bool up)
+ {
+- char path[40 + IFNAMSIZ];
+- sprintf(path, "/sys/class/net/%s/bridge/stp_state", br->sysdeps.name);
+- FILE *f = fopen(path, "r");
+- int enabled = 0;
+- if(!f || (1 != fscanf(f, "%d", &enabled)))
+- ERROR("Can't read from %s", path);
+- fclose(f);
+- INFO("STP on %s state %d", br->sysdeps.name, enabled);
++ INFO("%s was %s", br->sysdeps.name, br->sysdeps.up ? "up" : "down");
++ INFO("Set bridge %s %s", br->sysdeps.name, up ? "up" : "down");
+
+- return enabled == 2; /* ie user mode STP */
+-}
+-
+-static void set_br_up(bridge_t * br, bool up, bool stp_up)
+-{
+- INFO("%s was %s stp was %s", br->sysdeps.name,
+- br->sysdeps.up ? "up" : "down", br->sysdeps.stp_up ? "up" : "down");
+- INFO("Set bridge %s %s stp %s" , br->sysdeps.name,
+- up ? "up" : "down", stp_up ? "up" : "down");
+-
+ bool changed = false;
+
+ if(up != br->sysdeps.up)
+@@ -204,12 +188,6 @@
+ changed = true;
+ }
+
+- if(br->sysdeps.stp_up != stp_up)
+- {
+- br->sysdeps.stp_up = stp_up;
+- changed = true;
+- }
+-
+ if(check_mac_address(br->sysdeps.name, br->sysdeps.macaddr))
+ {
+ /* MAC address changed */
+@@ -218,7 +196,7 @@
+ }
+
+ if(changed)
+- MSTP_IN_set_bridge_enable(br, br->sysdeps.up && br->sysdeps.stp_up);
++ MSTP_IN_set_bridge_enable(br, br->sysdeps.up);
+ }
+
+ static void set_if_up(port_t * ifc, bool up)
+@@ -291,15 +269,10 @@
+ if((br_index >= 0) && (br_index != if_index))
+ {
+ if(!(br = find_br(br_index)))
+- br = create_br(br_index);
+- if(!br)
+- {
+- ERROR("Couldn't create data for bridge interface %d", br_index);
+- return -1;
+- }
++ return -2; /* bridge not in list */
+ int br_flags = get_flags(br->sysdeps.name);
+ if(br_flags >= 0)
+- set_br_up(br, !!(br_flags & IFF_UP), stp_enabled(br));
++ set_br_up(br, !!(br_flags & IFF_UP));
+ }
+
+ if(br)
+@@ -358,15 +331,8 @@
+ if(br_index == if_index)
+ {
+ if(!(br = find_br(br_index)))
+- {
+- if(!(br = create_br(br_index)))
+- {
+- ERROR("Couldn't create data for bridge interface %d",
+- br_index);
+- return -1;
+- }
+- }
+- set_br_up(br, up, stp_enabled(br));
++ return -2; /* bridge not in list */
++ set_br_up(br, up);
+ }
+ }
+ }
+@@ -412,8 +378,6 @@
+ /* sanity checks */
+ TST(br == ifc->bridge,);
+ TST(ifc->sysdeps.up,);
+- if(!br->sysdeps.stp_up)
+- return;
+
+ /* Validate Ethernet and LLC header,
+ * maybe we can skip this check thanks to Berkeley filter in packet socket?
+@@ -840,12 +804,85 @@
+ return MSTP_IN_set_all_fids2mstids(br, fids2mstids) ? 0 : -1;
+ }
+
+-int CTL_stp_mode_notification(int br_index, bool on)
++int CTL_add_bridges(int *br_array, int* *ifaces_lists)
+ {
+- int br_flags;
+- CTL_CHECK_BRIDGE;
+- if(0 > (br_flags = get_flags(br->sysdeps.name)))
+- return br_flags;
+- set_br_up(br, !!(br_flags & IFF_UP), on);
++ int i, j, ifcount, brcount = br_array[0];
++ bridge_t *br, *other_br;
++ port_t *ifc, *nxt;
++ int br_flags, if_flags;
++ int *if_array;
++ bool found;
++
++ for(i = 1; i <= brcount; ++i)
++ {
++ if(NULL == (br = find_br(br_array[i])))
++ {
++ if(NULL == (br = create_br(br_array[i])))
++ {
++ ERROR("Couldn't create data for bridge interface %d",
++ br_array[i]);
++ return -1;
++ }
++ if(0 <= (br_flags = get_flags(br->sysdeps.name)))
++ set_br_up(br, !!(br_flags & IFF_UP));
++ }
++ if_array = ifaces_lists[i - 1];
++ ifcount = if_array[0];
++ /* delete all interfaces which are not in list */
++ list_for_each_entry_safe(ifc, nxt, &br->ports, br_list)
++ {
++ found = false;
++ for(j = 1; j <= ifcount; ++j)
++ {
++ if(ifc->sysdeps.if_index == if_array[j])
++ {
++ found = true;
++ break;
++ }
++ }
++ if(!found)
++ delete_if(ifc);
++ }
++ /* add all new interfaces from the list */
++ for(j = 1; j <= ifcount; ++j)
++ {
++ if(NULL != find_if(br, if_array[j]))
++ continue;
++ /* Check if this interface is slave of another bridge */
++ list_for_each_entry(other_br, &bridges, list)
++ {
++ if(other_br != br)
++ if(delete_if_byindex(other_br, if_array[j]))
++ {
++ INFO("Device %d has come to bridge %s. "
++ "Missed notify for deletion from bridge %s",
++ if_array[j], br->sysdeps.name,
++ other_br->sysdeps.name);
++ break;
++ }
++ }
++ if(NULL == (ifc = create_if(br, if_array[j])))
++ {
++ INFO("Couldn't create data for interface %d (master %s)",
++ if_array[j], br->sysdeps.name);
++ continue;
++ }
++ if(0 <= (if_flags = get_flags(ifc->sysdeps.name)))
++ set_if_up(ifc, (IFF_UP | IFF_RUNNING) ==
++ (if_flags & (IFF_UP | IFF_RUNNING))
++ );
++ }
++ }
++
+ return 0;
+ }
++
++int CTL_del_bridges(int *br_array)
++{
++ int i, brcount = br_array[0];
++
++ for(i = 1; i <= brcount; ++i)
++ delete_br_byindex(br_array[i]);
++
++ return 0;
++}
+Index: ctl_socket_server.c
+===================================================================
+--- ctl_socket_server.c (revision 22)
++++ ctl_socket_server.c (revision 27)
+@@ -82,8 +82,92 @@
+ SERVER_MESSAGE_CASE(set_fid2mstid);
+ SERVER_MESSAGE_CASE(set_vids2fids);
+ SERVER_MESSAGE_CASE(set_fids2mstids);
+- SERVER_MESSAGE_CASE(stp_mode_notification);
+
++ case CMD_CODE_add_bridges:
++ {
++ if(0 != lout)
++ {
++ LOG("Bad sizes: lout %d != 0", lout);
++ return -1;
++ }
++ if(sizeof(int) > lin)
++ {
++ LOG("Bad sizes: lin == 0");
++ return -1;
++ }
++ int *br_array = inbuf;
++ int i, serialized_data_count, chunk_count, brcount = br_array[0];
++ int *ptr = br_array + (serialized_data_count = (brcount + 1));
++ if(lin < ((serialized_data_count + 1) * sizeof(int)))
++ {
++bad_lin1: LOG("Bad sizes: lin %d < %d", lin,
++ (serialized_data_count + 1) * sizeof(int));
++ return -1;
++ }
++ for(i = 0; i < brcount; ++i)
++ {
++ serialized_data_count += (chunk_count = *ptr + 1);
++ if(i < (brcount - 1))
++ {
++ if(lin < ((serialized_data_count + 1) * sizeof(int)))
++ goto bad_lin1;
++ ptr += chunk_count;
++ }
++ else
++ {
++ if(lin != (serialized_data_count * sizeof(int)))
++ {
++ LOG("Bad sizes: lin %d != %d", lin,
++ serialized_data_count * sizeof(int));
++ return -1;
++ }
++ }
++ }
++ int* *ifaces_lists = malloc(brcount * sizeof(int*));
++ if(NULL == ifaces_lists)
++ {
++ LOG("out of memory, brcount = %d\n", brcount);
++ return -1;
++ }
++ ptr = br_array + (brcount + 1);
++ for(i = 0; i < brcount; ++i)
++ {
++ ifaces_lists[i] = ptr;
++ ptr += ifaces_lists[i][0] + 1;
++ }
++ int r = CTL_add_bridges(br_array, ifaces_lists);
++ free(ifaces_lists);
++ if(r)
++ return r;
++ return r;
++ }
++
++ case CMD_CODE_del_bridges:
++ {
++ if(0 != lout)
++ {
++ LOG("Bad sizes: lout %d != 0", lout);
++ return -1;
++ }
++ if(sizeof(int) > lin)
++ {
++ LOG("Bad sizes: lin == 0");
++ return -1;
++ }
++ int *br_array = inbuf;
++ int brcount = br_array[0];
++ if(((brcount + 1) * sizeof(int)) != lin)
++ {
++ LOG("Bad sizes: lin %d != %d", lin,
++ (brcount + 1) * sizeof(int));
++ return -1;
++ }
++ int r = CTL_del_bridges(br_array);
++ if(r)
++ return r;
++ return r;
++ }
++
+ default:
+ ERROR("CTL: Unknown command %d", cmd);
+ return -1;
+Index: mstp.c
+===================================================================
+--- mstp.c (revision 22)
++++ mstp.c (revision 27)
+@@ -206,7 +206,6 @@
+ return false;
+ list_add_tail(&cist->bridge_list, &br->trees);
+
+- br_state_machines_begin(br);
+ return true;
+ }
+
+Index: ctl_main.c
+===================================================================
+--- ctl_main.c (revision 22)
++++ ctl_main.c (revision 27)
+@@ -636,6 +636,18 @@
+ return !('.' == n[0] && (0 == n[1] || ('.' == n[1] && 0 == n[2])));
+ }
+
++static int get_port_list(const char *br_ifname, struct dirent ***namelist)
++{
++ int res;
++ char buf[SYSFS_PATH_MAX];
++
++ snprintf(buf, sizeof(buf), SYSFS_CLASS_NET "/%s/brif", br_ifname);
++ if(0 > (res = scandir(buf, namelist, not_dot_dotdot, sorting_func)))
++ fprintf(stderr, "Error getting list of all ports of bridge %s\n",
++ br_ifname);
++ return res;
++}
++
+ static int cmd_showport(int argc, char *const *argv)
+ {
+ int r = 0;
+@@ -666,15 +678,8 @@
+ }
+ else
+ {
+- char buf[SYSFS_PATH_MAX];
+- snprintf(buf, sizeof(buf), SYSFS_CLASS_NET "/%s/brif", argv[1]);
+- count = scandir(buf, &namelist, not_dot_dotdot, sorting_func);
+- if(0 > count)
+- {
+- fprintf(stderr, "Error getting list of all ports of bridge %s\n",
+- argv[1]);
+- return -1;
+- }
++ if(0 > (count = get_port_list(argv[1], &namelist)))
++ return count;
+ }
+
+ for(i = 0; i < count; ++i)
+@@ -740,6 +745,91 @@
+ return 0;
+ }
+
++static int cmd_addbridge(int argc, char *const *argv)
++{
++ int i, j, res, ifcount, brcount = argc - 1;
++ int *br_array;
++ int* *ifaces_lists;
++
++ if(NULL == (br_array = malloc((brcount + 1) * sizeof(int))))
++ {
++out_of_memory_exit:
++ fprintf(stderr, "out of memory, brcount = %d\n", brcount);
++ return -1;
++ }
++ if(NULL == (ifaces_lists = malloc(brcount * sizeof(int*))))
++ {
++ free(br_array);
++ goto out_of_memory_exit;
++ }
++
++ br_array[0] = brcount;
++ for(i = 1; i <= brcount; ++i)
++ {
++ struct dirent **namelist;
++
++ br_array[i] = get_index(argv[i], "bridge");
++
++ if(0 > (ifcount = get_port_list(argv[i], &namelist)))
++ {
++ifaces_error_exit:
++ for(i -= 2; i >= 0; --i)
++ free(ifaces_lists[i]);
++ free(ifaces_lists);
++ free(br_array);
++ return ifcount;
++ }
++
++ if(NULL == (ifaces_lists[i - 1] = malloc((ifcount + 1) * sizeof(int))))
++ {
++ fprintf(stderr, "out of memory, bridge %s, ifcount = %d\n",
++ argv[i], ifcount);
++ for(j = 0; j < ifcount; ++j)
++ free(namelist[j]);
++ free(namelist);
++ ifcount = -1;
++ goto ifaces_error_exit;
++ }
++
++ ifaces_lists[i - 1][0] = ifcount;
++ for(j = 1; j <= ifcount; ++j)
++ {
++ ifaces_lists[i - 1][j] = get_index(namelist[j - 1]->d_name, "port");
++ free(namelist[j - 1]);
++ }
++ free(namelist);
++ }
++
++ res = CTL_add_bridges(br_array, ifaces_lists);
++
++ for(i = 0; i < brcount; ++i)
++ free(ifaces_lists[i]);
++ free(ifaces_lists);
++ free(br_array);
++ return res;
++}
++
++static int cmd_delbridge(int argc, char *const *argv)
++{
++ int i, res, brcount = argc - 1;
++ int *br_array;
++
++ if(NULL == (br_array = malloc((brcount + 1) * sizeof(int))))
++ {
++ fprintf(stderr, "out of memory, brcount = %d\n", brcount);
++ return -1;
++ }
++
++ br_array[0] = brcount;
++ for(i = 1; i <= brcount; ++i)
++ br_array[i] = get_index(argv[i], "bridge");
++
++ res = CTL_del_bridges(br_array);
++
++ free(br_array);
++ return res;
++}
++
+ static unsigned int getuint(const char *s)
+ {
+ char *end;
+@@ -1191,23 +1281,6 @@
+ return CTL_set_fid2mstid(br_index, fid, mstid);
+ }
+
+-static int cmd_stp_mode_notification(int argc, char *const *argv, bool on)
+-{
+- int br_index;
+- /* Because this command has special handling,
+- * argc was not checked earlier
+- */
+- if(2 > argc)
+- {
+- fprintf(stderr,
+- "Incorrect number of arguments for notification command\n");
+- exit(1);
+- }
+- if(0 > (br_index = get_index(argv[1], "bridge")))
+- return br_index;
+- return CTL_stp_mode_notification(br_index, on);
+-}
+-
+ struct command
+ {
+ int nargs;
+@@ -1220,6 +1293,12 @@
+
+ static const struct command commands[] =
+ {
++ /* Add/delete bridges */
++ {1, 32, "addbridge", cmd_addbridge,
++ "<bridge> [<bridge> ...]", "Add bridges to the mstpd's list"},
++ {1, 32, "delbridge", cmd_delbridge,
++ "<bridge> [<bridge> ...]", "Remove bridges from the mstpd's list"},
++
+ /* Show global bridge */
+ {0, 32, "showbridge", cmd_showbridge,
+ "[<bridge> ... [param]]", "Show bridge state for the CIST"},
+@@ -1370,12 +1449,6 @@
+ argv += optind;
+ if(NULL == (cmd = command_lookup(argv[0])))
+ {
+- /* Two special commands not intended for interactive use */
+- if(!strcmp(argv[0], "notify-daemon-that-stp-is-on"))
+- return cmd_stp_mode_notification(argc, argv, true);
+- if(!strcmp(argv[0], "notify-daemon-that-stp-is-off"))
+- return cmd_stp_mode_notification(argc, argv, false);
+-
+ fprintf(stderr, "never heard of command [%s]\n", argv[0]);
+ goto help;
+ }
+@@ -1417,8 +1490,61 @@
+ CLIENT_SIDE_FUNCTION(set_fid2mstid)
+ CLIENT_SIDE_FUNCTION(set_vids2fids)
+ CLIENT_SIDE_FUNCTION(set_fids2mstids)
+-CLIENT_SIDE_FUNCTION(stp_mode_notification)
+
++CTL_DECLARE(add_bridges)
++{
++ int res = 0;
++ LogString log = { .buf = "" };
++ int i, chunk_count, brcount, serialized_data_count;
++ int *serialized_data, *ptr;
++
++ chunk_count = serialized_data_count = (brcount = br_array[0]) + 1;
++ for(i = 0; i < brcount; ++i)
++ serialized_data_count += ifaces_lists[i][0] + 1;
++ if(NULL == (serialized_data = malloc(serialized_data_count * sizeof(int))))
++ {
++ LOG("out of memory, serialized_data_count = %d",
++ serialized_data_count);
++ return -1;
++ }
++ memcpy(serialized_data, br_array, chunk_count * sizeof(int));
++ ptr = serialized_data + chunk_count;
++ for(i = 0; i < brcount; ++i)
++ {
++ chunk_count = ifaces_lists[i][0] + 1;
++ memcpy(ptr, ifaces_lists[i], chunk_count * sizeof(int));
++ ptr += chunk_count;
++ }
++
++ int r = send_ctl_message(CMD_CODE_add_bridges, serialized_data,
++ serialized_data_count * sizeof(int),
++ NULL, 0, &log, &res);
++ free(serialized_data);
++ if(r || res)
++ LOG("Got return code %d, %d\n%s", r, res, log.buf);
++ if(r)
++ return r;
++ if(res)
++ return res;
++ return 0;
++}
++
++CTL_DECLARE(del_bridges)
++{
++ int res = 0;
++ LogString log = { .buf = "" };
++ int r = send_ctl_message(CMD_CODE_del_bridges,
++ br_array, (br_array[0] + 1) * sizeof(int),
++ NULL, 0, &log, &res);
++ if(r || res)
++ LOG("Got return code %d, %d\n%s", r, res, log.buf);
++ if(r)
++ return r;
++ if(res)
++ return res;
++ return 0;
++}
++
+ /*********************** Logging *********************/
+
+ void Dprintf(int level, const char *fmt, ...)
name = nspr
version = 4.8.6
-release = 1
+release = 2
groups = System/Libraries
url = http://www.mozilla.org/projects/nspr/
%{MACRO_PATCHES}
end
+ if "%{DISTRO_ARCH}" == "x86_64"
+ configure_options += \
+ --enable-64bit
+ end
+
+ if "%{DISTRO_ARCH}" == "armv7hl"
+ configure_options += \
+ --enable-thumb2
+ end
+
+ configure_options += \
+ --libdir=/%{lib} \
+ --includedir=/usr/include/nspr4 \
+ --enable-optimize="%{CFLAGS}" \
+ --disable-debug
+
build
%{DIR_APP}/mozilla/nsprpub/configure \
- %{configure_options} \
- --libdir=/lib \
- --includedir=/usr/include/nspr4 \
- --enable-optimize="%{CFLAGS}" \
- --disable-debug
+ %{configure_options}
make
end
install_cmds
- mkdir -pv %{BUILDROOT}/usr/{bin,lib}
- mkdir -pv %{BUILDROOT}/lib
- mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig
+ mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}}
+ mkdir -pv %{BUILDROOT}/%{lib}
+ mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
cp -vf %{DIR_APP}/config/nspr-config-pc \
%{BUILDROOT}/usr/bin/nspr-config
sed \
- -e "s,%libdir%,/usr/lib,g" \
+ -e "s,%libdir%,%{libdir},g" \
-e "s,%prefix%,/usr,g" \
-e "s,%exec_prefix%,/usr,g" \
-e "s,%includedir%,/usr/include/nspr4,g" \
-e "s,%NSPR_VERSION%,%{version},g" \
- -e "s,%FULL_NSPR_LIBS%,-L/usr/lib -lnspr4 -lplc4 -lplds4 -ldl -lpthread,g" \
+ -e "s,%FULL_NSPR_LIBS%,-L%{libdir} -lnspr4 -lplc4 -lplds4 -ldl -lpthread,g" \
-e "s,%FULL_NSPR_CFLAGS%,-I/usr/include/nspr4,g" \
< %{DIR_SOURCE}/nspr.pc.in \
- > %{BUILDROOT}/usr/lib/pkgconfig/nspr.pc
+ > %{BUILDROOT}%{libdir}/pkgconfig/nspr.pc
#mv -v %{BUILDROOT}/usr/lib/lib{nspr,plc.plds}4.so %{BUILDROOT}/lib/
- ln -svf ../../lib/libnspr4.so %{BUILDROOT}/usr/lib/libnspr4.so
- ln -svf ../../lib/libplc4.so %{BUILDROOT}/usr/lib/libplc4.so
- ln -svf ../../lib/libplds4.so %{BUILDROOT}/usr/lib/libplds4.so
+ ln -svf ../../%{lib}/libnspr4.so %{BUILDROOT}%{libdir}/libnspr4.so
+ ln -svf ../../%{lib}/libplc4.so %{BUILDROOT}%{libdir}/libplc4.so
+ ln -svf ../../%{lib}/libplds4.so %{BUILDROOT}%{libdir}/libplds4.so
# Remove unneeded stuff
rm -rfv \
name = nss-myhostname
version = 0.3
-release = 1
+release = 2
groups = System/Libraries
url = http://0pointer.de/lennart/projects/nss-myhostname/
build
configure_options += \
- --libdir=/lib
+ --libdir=/%{lib}
install_cmds
- mkdir -pv %{BUILDROOT}/usr/lib
- ln -svf ../../lib/libnss_myhostname.so.2 \
- %{BUILDROOT}/usr/lib/libnss_myhostname.so
+ mkdir -pv %{BUILDROOT}%{libdir}
+ ln -svf ../../%{lib}/libnss_myhostname.so.2 \
+ %{BUILDROOT}%{libdir}/libnss_myhostname.so
rm -rf %{BUILDROOT}/usr/share/doc/nss-myhostname
end
name = nss-softokn
version = 3.12.8
-release = 1
+release = 2
groups = System/Libraries
url = http://www.mozilla.org/projects/security/pki/nss/
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export NSPR_INCLUDE_DIR=/usr/include/nspr4
- export NSPR_LIB_DIR=/usr/lib
+ export NSPR_LIB_DIR=%{libdir}
export NSS_INCLUDE_DIR=/usr/include/nss3
- export NSS_LIB_DIR=/usr/lib
+ export NSS_LIB_DIR=%{libdir}
export NSS_USE_SYSTEM_SQLITE=1
+ if "%{DISTRO_ARCH}" == "x86_64"
+ export USE_64=1
+ end
+
build
make -C ./mozilla/security/coreconf
make -C ./mozilla/security/dbm
end
install
- mkdir -pv %{BUILDROOT}/lib
+ mkdir -pv %{BUILDROOT}/%{lib}
mkdir -pv %{BUILDROOT}/usr/include/nss3
- mkdir -pv %{BUILDROOT}/usr/{bin,lib}
- mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig
- mkdir -pv %{BUILDROOT}/usr/lib/nss/unsupported-tools
-
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libsoftokn3.so \
- %{BUILDROOT}/usr/lib
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnssdbm3.so \
- %{BUILDROOT}/usr/lib
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libfreebl3.so \
- %{BUILDROOT}/lib
- ln -svf ../../lib/libfreebl3.so %{BUILDROOT}/usr/lib/libfreebl3.so
+ mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}}
+ mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
+ mkdir -pv %{BUILDROOT}%{libdir}/nss/unsupported-tools
+
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libsoftokn3.so \
+ %{BUILDROOT}%{libdir}
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssdbm3.so \
+ %{BUILDROOT}%{libdir}
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libfreebl3.so \
+ %{BUILDROOT}/%{lib}
+ ln -svf ../../%{lib}/libfreebl3.so %{BUILDROOT}%{libdir}/libfreebl3.so
# Copy the binaries we ship as unsupported
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/shlibsign %{BUILDROOT}/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/shlibsign \
+ %{BUILDROOT}%{libdir}/nss/unsupported-tools
- sed -e "s,@libdir@,/usr/lib,g" \
+ 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.*SOFTOKEN_VMAJOR" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
- -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMINOR" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
- -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*SOFTOKEN_VPATCH" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+ -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMAJOR" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+ -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMINOR" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+ -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*SOFTOKEN_VPATCH" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
< %{DIR_SOURCE}/nss-softokn-config.in \
> %{BUILDROOT}/usr/bin/nss-softokn-config
chmod -v 755 %{BUILDROOT}/usr/bin/nss-softokn-config
# XXX need to fix this
sed \
- -e "s,%libdir%,/usr/lib,g" \
+ -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,%NSSUTIL_VERSION%,$$(nss-util-config --version),g" \
-e "s,%SOFTOKEN_VERSION%,%{version},g" \
< %{DIR_SOURCE}/nss-softokn.pc.in \
- > %{BUILDROOT}/usr/lib/pkgconfig/nss-softokn.pc
+ > %{BUILDROOT}%{libdir}/pkgconfig/nss-softokn.pc
# Copy the include files we want
- cp -vf %{DIR_APP}/mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
- cp -vf %{DIR_APP}/mozilla/dist/private/nss/blapi.h \
+ cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
+ cp -vf mozilla/dist/private/nss/blapi.h \
%{BUILDROOT}/usr/include/nss3
chmod -v 644 %{BUILDROOT}/usr/include/nss3/*.h
end
files
/usr/bin/*-config
/usr/include
- /usr/lib/libfreebl3.so
- /usr/lib/pkgconfig
+ %{libdir}/libfreebl3.so
+ %{libdir}/pkgconfig
end
end
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export NSPR_INCLUDE_DIR=/usr/include/nspr4
- export NSPR_LIB_DIR=/usr/lib
+ export NSPR_LIB_DIR=%{libdir}
export NSS_INCLUDE_DIR=/usr/include/nss3
- export NSS_LIB_DIR=/usr/lib
+ export NSS_LIB_DIR=%{libdir}
export NSS_USE_SYSTEM_SQLITE=1
+ if "%{DISTRO_ARCH}" == "x86_64"
+ export USE_64=1
+ end
+
build
make -C ./mozilla/security/coreconf
make -C ./mozilla/security/nss
install
mkdir -pv %{BUILDROOT}/usr/bin
mkdir -pv %{BUILDROOT}/usr/include/nss3
- mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig
+ mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnssutil3.so \
- %{BUILDROOT}/usr/lib
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssutil3.so \
+ %{BUILDROOT}%{libdir}
- sed -e "s,@libdir@,/usr/lib,g" \
+ 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.*NSSUTIL_VMAJOR" %{DIR_APP}/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
- -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*NSSUTIL_VMINOR" %{DIR_APP}/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
- -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*NSSUTIL_VPATCH" %{DIR_APP}/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
+ -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*NSSUTIL_VMAJOR" mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
+ -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*NSSUTIL_VMINOR" mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
+ -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*NSSUTIL_VPATCH" mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
< %{DIR_SOURCE}/nss-util-config.in \
> %{BUILDROOT}/usr/bin/nss-util-config
chmod -v 755 %{BUILDROOT}/usr/bin/nss-util-config
sed \
- -e "s,%libdir%,/usr/lib,g" \
+ -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,%NSPR_VERSION%,$$(nspr-config --version),g" \
-e "s,%NSSUTIL_VERSION%,%{name},g" \
< %{DIR_SOURCE}/nss-util.pc.in \
- > %{BUILDROOT}/usr/lib/pkgconfig/nss-util.pc
+ > %{BUILDROOT}%{libdir}/pkgconfig/nss-util.pc
# The util headers, the rest come from softokn and nss
- cp -vf %{DIR_APP}/mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
+ cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
chmod -v 644 %{BUILDROOT}/usr/include/nss3/*.h
end
end
files
/usr/bin/*-config
/usr/include
- /usr/lib/pkgconfig
+ %{libdir}/pkgconfig
end
end
name = nss
version = 3.12.8
-release = 3
+release = 4
groups = System/Libraries
url = http://www.mozilla.org/projects/security/pki/nss/
build
requires
+ chrpath
nspr-devel
nss-softokn-devel
nss-util-devel
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export NSPR_INCLUDE_DIR=/usr/include/nspr4
- export NSPR_LIB_DIR=/usr/lib
+ export NSPR_LIB_DIR=%{libdir}
export NSS_INCLUDE_DIR=/usr/include/nss3
- export NSS_LIB_DIR=/usr/lib
+ export NSS_LIB_DIR=%{libdir}
export NSS_USE_SYSTEM_SQLITE=1
+ if "%{DISTRO_ARCH}" == "x86_64"
+ export USE_64=1
+ end
+
prepare
# Extract tarball
cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/%{thisapp}-stripped.tar.bz2
install
mkdir -pv %{BUILDROOT}/usr/include/nss3
- mkdir -pv %{BUILDROOT}/usr/{bin,lib}
- mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig
- mkdir -pv %{BUILDROOT}/usr/lib/nss/unsupported-tools
-
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnss3.so \
- %{BUILDROOT}/usr/lib
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnssckbi.so \
- %{BUILDROOT}/usr/lib
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnsspem.so \
- %{BUILDROOT}/usr/lib
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnsssysinit.so \
- %{BUILDROOT}/usr/lib
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libsmime3.so \
- %{BUILDROOT}/usr/lib
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libssl3.so \
- %{BUILDROOT}/usr/lib
+ mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}}
+ mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
+ mkdir -pv %{BUILDROOT}%{libdir}/nss/unsupported-tools
+
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnss3.so \
+ %{BUILDROOT}%{libdir}
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssckbi.so \
+ %{BUILDROOT}%{libdir}
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnsspem.so \
+ %{BUILDROOT}%{libdir}
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnsssysinit.so \
+ %{BUILDROOT}%{libdir}
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libsmime3.so \
+ %{BUILDROOT}%{libdir}
+ install -p -v -m 755 mozilla/dist/*.OBJ/lib/libssl3.so \
+ %{BUILDROOT}%{libdir}
# Install the empty NSS db files
mkdir -pv %{BUILDROOT}/etc/pki/nssdb
%{BUILDROOT}/etc/pki/nssdb/pkcs11.txt
# Copy the binaries we want
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/certutil %{BUILDROOT}/usr/bin
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/cmsutil %{BUILDROOT}/usr/bin
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/crlutil %{BUILDROOT}/usr/bin
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/modutil %{BUILDROOT}/usr/bin
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/pk12util %{BUILDROOT}/usr/bin
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/signtool %{BUILDROOT}/usr/bin
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/signver %{BUILDROOT}/usr/bin
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/ssltap %{BUILDROOT}/usr/bin
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/certutil %{BUILDROOT}/usr/bin
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/cmsutil %{BUILDROOT}/usr/bin
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/crlutil %{BUILDROOT}/usr/bin
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/modutil %{BUILDROOT}/usr/bin
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/pk12util %{BUILDROOT}/usr/bin
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/signtool %{BUILDROOT}/usr/bin
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/signver %{BUILDROOT}/usr/bin
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/ssltap %{BUILDROOT}/usr/bin
+ chrpath --delete %{BUILDROOT}/usr/bin/*
# Copy the binaries we ship as unsupported
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/atob %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/btoa %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/derdump %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/ocspclnt %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/pp %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/selfserv %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/strsclnt %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/symkeyutil %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/tstclnt %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/vfyserv %{BUILDROOT}/usr/lib/nss/unsupported-tools
- install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/vfychain %{BUILDROOT}/usr/lib/nss/unsupported-tools
-
- sed -e "s,@libdir@,/usr/lib,g" \
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/atob %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/btoa %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/derdump %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/ocspclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/pp %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/selfserv %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/strsclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/symkeyutil %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/tstclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/vfyserv %{BUILDROOT}%{libdir}/nss/unsupported-tools
+ install -p -v -m 755 mozilla/dist/*.OBJ/bin/vfychain %{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" %{DIR_APP}/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
- -e "s,@MOD_MINOR_VERSION@,$(grep "#define.*NSS_VMINOR" %{DIR_APP}/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
- -e "s,@MOD_PATCH_VERSION@,$(grep "#define.*NSS_VPATCH" %{DIR_APP}/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),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
# XXX need to fix this
sed \
- -e "s,%libdir%,/usr/lib,g" \
+ -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,%NSSUTIL_VERSION%,$(nss-util-config --version),g" \
-e "s,%SOFTOKEN_VERSION%,$(nss-softokn-config --version),g" \
< %{DIR_SOURCE}/nss.pc.in \
- > %{BUILDROOT}/usr/lib/pkgconfig/nss.pc
+ > %{BUILDROOT}%{libdir}/pkgconfig/nss.pc
# Copy the include files we want
- cp -vf %{DIR_APP}/mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
+ cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
chmod -v 644 %{BUILDROOT}/usr/include/nss3/*.h
# remove the nss-util-devel headers
end
end
-# XXX need to be removed
-quality-agent
- whitelist_rpath
- $ORIGIN/../lib
- end
-end
-
packages
package %{name}
template LIBS
files
- /usr/lib/*.so
+ %{libdir}/*.so
end
end
files
/usr/bin/*-config
/usr/include
- /usr/lib/pkgconfig
+ %{libdir}/pkgconfig
end
end
name = nss_ldap
version = 265
-release = 2
+release = 3
groups = System/Base
url = http://www.padl.com/
configure_options += \
--sysconfdir=/etc \
- --libdir=/lib \
+ --libdir=/%{lib} \
--with-ldap-lib=openldap \
--enable-rfc2307bis \
--with-ldap-conf-file=/etc/nss_ldap.conf \
# Remove awkward directory
rm -rvf %{BUILDROOT}/usr/usr
- mv -v %{BUILDROOT}/lib/* %{BUILDROOT}/usr/lib
- rm -rvf %{BUILDROOT}/lib
- ln -svf libnss_ldap-%{version}.so %{BUILDROOT}/usr/lib/libnss_ldap.so
+ mv -v %{BUILDROOT}/%{lib}/* %{BUILDROOT}%{libdir}
+ rm -rvf %{BUILDROOT}/%{lib}
+ ln -svf libnss_ldap-%{version}.so %{BUILDROOT}%{libdir}/libnss_ldap.so
+ ln -svf libnss_ldap.so.2 %{BUILDROOT}%{libdir}/libnss_ldap.so
rm -vf %{BUILDROOT}/etc/nsswitch.ldap
cd %{DIR_APP} && sed 's|dc=padl|dc=example|g' ldap.conf > \
%{BUILDROOT}/etc/nss_ldap.conf
touch %{BUILDROOT}/etc/nss_ldap.secret
-
- ln -svf libnss_ldap.so.2 %{BUILDROOT}/usr/lib/libnss_ldap.so
end
end
packages
package %{name}
requires
- /lib/security/pam_ldap.so
+ /%{lib}/security/pam_ldap.so
end
end
name = openjade
version = 1.3.2
-release = 2
+release = 3
groups = Application/Text
url = http://openjade.sourceforge.net/
--disable-static \
--disable-rpath \
--datadir=/usr/share/sgml/openjade-%{version} \
- --enable-splibdir=/usr/lib
+ --enable-splibdir=%{libdir}
install_cmds
# Create symlink for jade
sgml-common
end
- prerequires +=\
- docbook-dtds>=1.0-3 \
- libxml2 \
+ prerequires
+ docbook-dtds >= 1.0-3
+ libxml2
sgml-common
+ end
script postin
# Install catalog files on system.
###############################################################################
name = openldap
-version = 2.4.25
+version = 2.4.28
release = 2
groups = System/Daemons
documentation for OpenLDAP.
end
-source_dl =
+source_dl = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
sources = %{thisapp}.tgz
build
end
configure_options += \
- --libexecdir=/usr/lib \
+ --libexecdir=%{libdir} \
--sysconfdir=/etc \
--localstatedir=/var \
--with-threads=posix \
#endef
install_cmds
- mv -v %{BUILDROOT}/usr/lib/slapd %{BUILDROOT}/usr/sbin/slapd
+ mv -v %{BUILDROOT}%{libdir}/slapd %{BUILDROOT}/usr/sbin/slapd
ln -svf slapd %{BUILDROOT}/usr/sbin/slapacl
ln -svf slapd %{BUILDROOT}/usr/sbin/slapadd
ln -svf slapd %{BUILDROOT}/usr/sbin/slapauth
rm -rvf %{BUILDROOT}/var/openldap-data
for LINK in lber ldap ldap_r; do
- chmod -v 0755 %{BUILDROOT}/usr/lib/$(readlink %{BUILDROOT}/usr/lib/lib${LINK}.so)
+ chmod -v 0755 %{BUILDROOT}%{libdir}/$(readlink %{BUILDROOT}%{libdir}/lib${LINK}.so)
done
# Install configuration
name = opensp
version = 1.5.2
-release = 2
+release = 3
groups = Application/Text
url = http://openjade.sourceforge.net/
docbook-xsl
libxml2
libxslt
+ perl
xmlto
end
name = pam
version = 1.1.0
-release = 4
+release = 5
thisapp = Linux-PAM-%{version}
groups = System/Base
build
requires
- audit-devel
+ #audit-devel
bison
cracklib-devel
flex
end
configure_options += \
- --libdir=/lib \
- --sbindir=/lib/security \
- --enable-securedir=/lib/security \
+ --libdir=/%{lib} \
+ --includedir=%{includedir}/security \
--docdir=/usr/share/doc/Linux-PAM-%{version} \
--enable-read-both-confs
install_cmds
- mkdir -pv %{BUILDROOT}/sbin
- chmod -v 4755 %{BUILDROOT}/lib/security/unix_chkpwd
- mv -v %{BUILDROOT}/lib/security/pam_tally %{BUILDROOT}/sbin
-
- mkdir -pv %{BUILDROOT}/usr/lib
- for LINK in libpam{,c,_misc}.so; do \
- ln -v -sf ../../lib/$(readlink %{BUILDROOT}/lib/${LINK}) \
- %{BUILDROOT}/usr/lib/${LINK} && \
- rm -v %{BUILDROOT}/lib/${LINK}; \
+ mkdir -pv %{BUILDROOT}%{libdir}
+ for LINK in libpam{,c,_misc}.so; do
+ ln -v -sf ../../%{lib}/$(readlink %{BUILDROOT}/%{lib}/${LINK}) \
+ %{BUILDROOT}%{libdir}/${LINK}
+ rm -v %{BUILDROOT}/%{lib}/${LINK}
done
#useradd -D -b /home
#sed -i 's/yes/no/' %{BUILDROOT}/etc/default/useradd
mkdir -pv %{BUILDROOT}/etc/security
- install -v -m644 %{DIR_SOURCE}/pam_env.conf %{BUILDROOT}/etc/security/pam_env.conf
+ install -v -m644 %{DIR_SOURCE}/pam_env.conf \
+ %{BUILDROOT}/etc/security/pam_env.conf
# Included in setup package
rm -f %{BUILDROOT}/etc/environment
packages
package %{name}
- requires
- pam_ldap
- end
+ #requires
+ # pam_ldap
+ #end
end
package %{name}-devel
name = pam_ldap
version = 186
-release = 1
+release = 2
groups = System/Base
url = http://www.padl.com/OSS/pam_ldap.html
configure_options += \
--sysconfdir=/etc \
- --libdir=/lib \
+ --libdir=/%{lib} \
--mandir=/usr/share/man \
--with-ldap-conf-file=/etc/pam_ldap.conf \
--with-ldap-secret-file=/etc/pam_ldap.secret
install
# Create directory layout
- mkdir -pv %{BUILDROOT}/{etc,/lib/security,/usr/lib}
+ mkdir -pv %{BUILDROOT}/{etc,%{lib}/security,%{libdir}}
# Prevent to install an ldap.conf
touch %{BUILDROOT}/etc/ldap.conf
--- /dev/null
+#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__s390x__)
+#include "config.lib64.h"
+#elif defined(__sparc__) && defined (__arch64__)
+#include "config.lib64.h"
+#elif defined(__i386__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__alpha__) || defined(__sparc__) || defined(__sh__) || defined(__arm__)
+#include "config.lib.h"
+#else
+#error Unknown Arch
+#endif
name = pciutils
version = 3.1.7
-release = 2
+release = 3
groups = System/Base
url = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
build
build
- make SHARED=yes OPT="%{CFLAGS}" PREFIX=/usr \
+ make SHARED=yes OPT="%{CFLAGS}" PREFIX=/usr STRIP="" \
IDSDIR=/usr/share/hwdata ZLIB=no %{PARALLELISMFLAGS}
+
+ #fix lib vs. lib64 in libpci.pc (static Makefile is used)
+ sed -i "s|^libdir=.*$|libdir=/%{lib}|" lib/libpci.pc
end
install
- make SHARED=yes PREFIX=/usr install DESTDIR=%{BUILDROOT} \
- IDSDIR=/usr/share/hwdata MANDIR=/usr/share/man
+ # Install binaries.
+ mkdir -pv %{BUILDROOT}/sbin %{BUILDROOT}%{sbindir}
+ install -p lspci setpci %{BUILDROOT}/sbin
+ install -p update-pciids %{BUILDROOT}/%{sbindir}
+
+ # Install man pages.
+ mkdir -pv %{BUILDROOT}%{mandir}/man8
+ install -p -m 644 lspci.8 setpci.8 update-pciids.8 %{BUILDROOT}%{mandir}/man8
- mkdir -pv %{BUILDROOT}/usr/include/pci
- install -v -m 644 %{DIR_APP}/lib/*.h %{BUILDROOT}/usr/include/pci
+ # Install libs.
+ mkdir -pv %{BUILDROOT}/%{lib} %{BUILDROOT}%{libdir}
+ install -p lib/libpci.so.* %{BUILDROOT}/%{lib}/
+ ln -s ../../%{lib}/$(basename %{BUILDROOT}/%{lib}/*.so.*.*.*) \
+ %{BUILDROOT}%{libdir}/libpci.so
- mkdir -pv %{BUILDROOT}/usr/lib
- ln -svf libpci.so.3 %{BUILDROOT}/usr/lib/libpci.so
+ # Install headers.
+ mkdir -pv %{BUILDROOT}%{includedir}/pci
+ install -p lib/pci.h %{BUILDROOT}%{includedir}/pci
+ install -p lib/header.h %{BUILDROOT}%{includedir}/pci
+ install -p %{DIR_SOURCE}/multilibconfig.h %{BUILDROOT}%{includedir}/pci/config.h
+ install -p lib/config.h %{BUILDROOT}%{includedir}/pci/config.%{lib}.h
+ install -p lib/types.h %{BUILDROOT}%{includedir}/pci
+
+ # Install pkg-config files.
+ mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
+ install -p lib/libpci.pc %{BUILDROOT}%{libdir}/pkgconfig
end
end
package %{name}-libs
template LIBS
+
+ requires
+ /usr/share/hwdata/pci.ids
+ end
end
package %{name}-devel
--- /dev/null
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info@ipfire.org> #
+###############################################################################
+
+name = perl-Crypt-PasswdMD5
+version = 1.3
+release = 1
+arch = noarch
+thisapp = Crypt-PasswdMD5-%{version}
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/Crypt-PasswdMD5
+license = GPL+
+summary = Provides interoperable MD5-based crypt() functions.
+
+description
+ This package provides MD5-based crypt() functions.
+end
+
+source_dl = http://search.cpan.org/CPAN/authors/id/L/LU/LUISMUNOZ/
+
+build
+ requires
+ perl(ExtUtils::MakeMaker)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ make_install_targets = pure_install PERL_INSTALL_ROOT=%{BUILDROOT}
+end
+
+packages
+ package %{name}
+ requires
+ perl
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
name = perl-Tk
version = 804.029
-release = 1
+release = 2
thisapp = Tk-%{version}
groups = Development/Libraries
install
make pure_install PERL_INSTALL_ROOT=%{BUILDROOT}
+
+ # Remove interpreter in /usr/local...
+ sed -e "s@#!.*@#!/usr/bin/perl -w@g" \
+ -i %{BUILDROOT}%{libdir}/perl5/vendor_perl/Tk/pTk/{Tcl-pTk,mkVFunc}
end
end
name = perl
version = 5.14.2
# Never reset release in this package, just increase.
-release = 10
+release = 11
perl_epoch = 2
thisver = %{perl_epoch}:%{version}-%{_release}
InternetConfig
Mac::
NDBM_File
+ Tk
VMS::
end
end
# Copyright (C) - IPFire Development Team <info@ipfire.org> #
###############################################################################
-name = dbus-python
+name = python-dbus
version = 0.82.4
-release = 1
+release = 2
+thisapp = dbus-python-%{version}
groups = System/Libraries
url = http://www.freedesktop.org/software/dbus/
name = systemd
version = 37
-release = 1
+release = 2
maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
groups = System/Base
configure_options += \
--sysconfdir=/etc \
- --libexecdir=/usr/lib \
+ --libexecdir=%{libdir} \
--with-rootdir= \
--with-distro=ipfire \
--with-udevrulesdir=/lib/udev/rules.d/ \
- --with-pamlibdir=/lib/security
+ --with-pamlibdir=/%{lib}/security
prepare_cmds
./autogen.sh ac
name = udev
version = 172
-release = 4
+release = 5
groups = System/Base
url = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
--exec-prefix="" \
--sbindir=/sbin \
--sysconfdir=/etc \
- --libexecdir=/lib/udev \
- --with-rootlibdir=/lib \
+ --libexecdir=/%{lib}/udev \
+ --with-rootlibdir=/%{lib} \
--with-selinux \
--disable-introspection \
--with-systemdsystemunitdir=/lib/systemd/system
install_cmds
- # Install pkg-config files correctly
- mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib
+ rm -vf %{BUILDROOT}/%{lib}/lib{udev,gudev-1.0}.so
+ ln -svf ../../%{lib}/libudev.so.0 %{BUILDROOT}%{libdir}/libudev.so
+ ln -svf ../../%{lib}/libgudev-1.0.so.0 %{BUILDROOT}%{libdir}/libgudev-1.0.so
- rm -vf %{BUILDROOT}/lib/lib{udev,gudev-1.0}.so
- ln -svf ../../lib/libudev.so.0 %{BUILDROOT}/usr/lib/libudev.so
- ln -svf ../../lib/libgudev-1.0.so.0 %{BUILDROOT}/usr/lib/libgudev-1.0.so
-
- ln -svf ../../../../lib/udev/udev-acl \
- %{BUILDROOT}/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
+ # We do not use ConsoleKit
+ rm -rf %{BUILDROOT}/usr/lib*/ConsoleKit
# Remove network rules. We have our own in the network package.
- rm -v %{BUILDROOT}/lib/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules}
+ rm -v %{BUILDROOT}/%{lib}/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules}
end
end
name = usbutils
epoch = 1
version = 003
-release = 1
+release = 2
groups = System/Tools
url = http://www.linux-usb.org/
packages
package %{name}
+ requires
+ /usr/share/hwdata/usb.ids
+ end
end
package %{name}-debuginfo
name = util-linux
major_ver = 2.20
version = %{major_ver}
-release = 1
+release = 2
groups = System/Base
url = http://kernel.org/~kzak/util-linux/
end
files
- /lib/libblkid.*
+ /%{lib}/libblkid.*
end
end
files
/usr/include/blkid/
- /usr/lib/libblkid.*
- /usr/lib/pkgconfig/blkid.pc
+ %{libdir}/libblkid.*
+ %{libdir}/pkgconfig/blkid.pc
/usr/share/man/man3/*blkid*
end
end
end
files
- /lib/libuuid.*
+ /%{lib}/libuuid.*
end
end
files
/usr/include/uuid/
- /usr/lib/libuuid.*
- /usr/lib/pkgconfig/uuid.pc
+ %{libdir}/libuuid.*
+ %{libdir}/pkgconfig/uuid.pc
/usr/share/man/man3/*uuid*
end
end
end
files
- /lib/libmount.*
+ /%{lib}/libmount.*
end
end
files
/usr/include/mount/
- /usr/lib/libmount.*
- /usr/lib/pkgconfig/mount.pc
+ %{libdir}/libmount.*
+ %{libdir}/pkgconfig/mount.pc
/usr/share/man/man3/*mount*
end
end
###############################################################################
name = xfsprogs
-version = 3.1.2
+version = 3.1.7
release = 1
groups = System/Filesystems
end
configure_options += \
- --mandir=/usr/share/man \
--bindir=/sbin \
--sbindir=/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
+ --libdir=/%{lib} \
+ --libexecdir=%{libdir} \
--enable-readline=yes \
--enable-blkid=yes \
--disable-static
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
end
- make_build_targets +=\
- V=1 DEBUG=-DNDEBUG
-
+ make_build_targets += V=1 DEBUG=-DNDEBUG
install
- make install install-dev install-qa DIST_ROOT=%{BUILDROOT}
+ make install install-dev install-qa V=1 DIST_ROOT=%{BUILDROOT}
- chmod -v 755 %{BUILDROOT}/lib/libhandle.so*
- rm -vf %{BUILDROOT}/lib/libhandle.so
- mkdir -pv %{BUILDROOT}/usr/lib
- ln -svf ../../lib/libhandle.so.1 %{BUILDROOT}/usr/lib/libhandle.so
+ chmod -v 755 %{BUILDROOT}/%{lib}/libhandle.so*
+ rm -vf %{BUILDROOT}/%{lib}/libhandle.so
+ mkdir -pv %{BUILDROOT}%{libdir}
+ ln -svf ../../%{lib}/libhandle.so.1 %{BUILDROOT}%{libdir}/libhandle.so
end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
# Copyright (C) - IPFire Development Team <info@ipfire.org> #
###############################################################################
-name = xorg-xtrans
+name = xorg-x11-xtrans-devel
version = 1.2.5
-release = 1
+release = 2
+thisapp = xorg-xtrans-%{version}
arch = noarch
maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
projects / people / ms / ipfire-3.x.git / commitdiff
