]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into docbook
authorStefan Schantl <stefan.schantl@ipfire.org>
Mon, 17 Oct 2011 17:48:11 +0000 (19:48 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Mon, 17 Oct 2011 17:48:11 +0000 (19:48 +0200)
74 files changed:
bash/bash.nm
binutils/binutils.nm
bird/bird.nm
cairo/cairo.nm
chrony/chrony-helper
chrony/chrony.nm
coreutils/coreutils.nm
cups/cups.nm
dbus/dbus.nm
diffutils/diffutils.nm
diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch [deleted file]
diffutils/patches/diffutils-2.9-i18n-1.patch [deleted file]
diffutils/patches/diffutils-cmp-s-empty.patch [new file with mode: 0644]
ebtables/ebtables.nm
file/file.nm
ghostscript/ghostscript.nm
gnupg2/gnupg2.nm
gnutls/gnutls.nm
grub/default/grub [moved from grub/grub.default with 100% similarity]
grub/grub.nm
initscripts/initscripts.nm
initscripts/src/Makefile
initscripts/src/console_init.c [deleted file]
initscripts/udev/10-console.rules [deleted file]
intltool/intltool.nm
kbd/kbd.nm
kbd/patches/kbd-1.15-po.patch [deleted file]
kbd/patches/kbd-1.15-quiet_doc.patch [deleted file]
kbd/patches/kbd-1.15-sparc.patch [deleted file]
kbd/patches/kbd-1.15.3-dumpkeys-man.patch [new file with mode: 0644]
kbd/patches/kbd-1.15.3-fix-es-translation.patch [new file with mode: 0644]
kernel/kernel.nm
libcap/libcap.nm
libcap/patches/libcap-2.16-build-system-fixes.patch [deleted file]
libcap/patches/libcap-2.16-headerfix.patch [deleted file]
libtool/libtool.nm
lzo/lzo.nm
man-pages/man-pages.nm
mc/mc.nm
ncurses/ncurses.nm
net-snmp/net-snmp.nm
nettle/nettle.nm
network/network.nm
newt/newt.nm
openssl/openssl.nm
pakfire/pakfire.nm
paxtest/paxtest.nm
perl-Test-Simple/perl-Test-Simple.nm [deleted file]
perl-libwww-perl/perl-libwww-perl.nm
perl/perl.nm
python-gudev/python-gudev.nm
python/python.nm
radvd/radvd.nm
rstp/rstp.nm
rsyslog/rsyslog.log
rsyslog/rsyslog.nm
samba/samba.nm
setup/setup.nm
shadow-utils/default/useradd [moved from shadow-utils/useradd.default with 100% similarity]
shadow-utils/shadow-utils.nm
squid/squid.nm
systemd/patches/systemd-36-no_manpages.patch [moved from systemd/patches/systemd-33-no_manpages.patch with 91% similarity]
systemd/systemd.nm
tcl/tcl.nm
udev/console_init [deleted file]
udev/rules/10-console.rules [deleted file]
udev/udev.nm
unzip/unzip.nm
util-linux/util-linux.nm
xen/xen.nm
xorg-x11-font-utils/xorg-x11-font-utils.nm
xorg-x11-font-utils/xorg-x11-fonts-update-dirs [new file with mode: 0644]
xorg-x11-fonts/xorg-x11-fonts.nm
xz/xz.nm

index bc9662d3e4eaca7fee926f6c8d1b368057e041a9..d9d33b34cf015b14b8ddba78138d50600049f5ec 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = bash
 version    = 4.2
-release    = 2
+release    = 4
 
 groups     = Base Build System/Tools
 url        = http://www.gnu.org/software/bash/
@@ -67,6 +67,47 @@ end
 
 packages
        package %{name}
+               prerequires = coreutils
                requires = /etc/bashrc /etc/profile
+
+               script postin
+                       # Create /etc/shells, if it does not exist.
+                       [ -f "/etc/shells" ] || touch /etc/shells
+
+                       found_sh=0
+                       found_bash=0
+                       while read line; do
+                               if [ "/bin/bash" = "${line}" ]; then
+                                       found_bash=1
+                               elif [ "/bin/sh" = "${line}" ]; then
+                                       found_sh=1
+                               fi
+                       done < /etc/shells
+
+                       if [ "${found_bash}" = "0" ]; then
+                               echo "/bin/bash" >> /etc/shells
+                       fi
+
+                       if [ "${found_sh}" = "0" ]; then
+                               echo "/bin/sh" >> /etc/shells
+                       fi
+               end
+
+               script postun
+                       [ -e "/etc/shells" ] || exit 0
+
+                       # Remove /bin/bash and /bin/sh from /etc/shells.
+                       while read line; do
+                               if [ "/bin/bash" = "${line}" ]; then
+                                       continue
+                               elif [ "/bin/sh" = "${line}" ]; then
+                                       continue
+                               fi
+
+                               echo "${line}"
+                       done < /etc/shells > /etc/shells.$$
+
+                       mv -f /etc/shells{.$$,}
+               end
        end
 end
index f8c808ee417b9f6b0db96748ffc3d67bc9b204e7..bb6919a62afb33d4326544e47d05dd7059caa2e3 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = binutils
 version    = 2.21.51.0.8
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Tools
@@ -75,5 +75,8 @@ end
 
 packages
        package %{name}
+
+       package %{name}-devel
+               template DEVEL
        end
 end
index e86eda2599529792fd65a1102b3f97a9cc58889c..b6bcb7f26990249a6ae3a7affa3c4c654fa45795 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = bird
 version    = 1.3.1
-release    = 1
+release    = 2
 
 groups     = Networking/Routing
 url        = http://bird.network.cz/
@@ -57,5 +57,28 @@ end
 
 packages
        package %{name}
+               prerequires = systemd-units
+
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable bird.service > /dev/null 2>&1 || :
+                       /bin/systemctl stop bird.service > /dev/null 2>&1 || :
+
+                       /bin/systemctl --no-reload disable bird6.service > /dev/null 2>&1 || :
+                       /bin/systemctl stop bird6.service > /dev/null 2>&1 || :
+               end
+
+               script postun
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload 2>&1 || :
+                       /bin/systemctl reload-or-try-restart bird.service >/dev/null 2>&1 || :
+                       /bin/systemctl reload-or-try-restart bird6.service >/dev/null 2>&1 || :
+               end
        end
 end
index af94c848b6240c74bc484390de7b5f5cd840ed4f..ed393a31ee91bd42b978dc0c31522d432ee0631c 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = cairo
 version    = 1.10.2
-release    = 2
+release    = 3
 
 groups     = System/Graphics
 url        = http://cairographics.org
@@ -21,6 +21,7 @@ source_dl  = http://cairographics.org/releases/
 
 build
        requires
+               binutils>=2.21.51.0.8-2
                fontconfig-devel
                freetype-devel
                libpng-devel
@@ -32,8 +33,7 @@ end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-devel
                template DEVEL
        
index a5bbf8479c082e5b0078d604786063d926637f56..34add5f40bded6cfee90ac476a99c274dc30de9e 100644 (file)
@@ -32,7 +32,7 @@ generate_commandkey() {
     commandkey=$(get_key $commandkeyid)
     [ -z "$commandkey" ] || return 0
 
-    commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 8)
+    commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 16)
     [ -n "$commandkey" ] && echo "$commandkeyid $commandkey" >> $keyfile
 }
 
index fb44fbb7ea8a79fd4ecc2e3857537afd14363076..3ab23aae313c7e7f3da4d610087472391adba69f 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = chrony
 version    = 1.26
-release    = 6
+release    = 7
 
 groups     = Base System/Daemons
 url        = http://chrony.tuxfamily.org
@@ -73,31 +73,32 @@ end
 
 packages
        package %{name}
-               preprequires = shadow-utils systemd-units
-       
                configfiles
                        /etc/chrony.conf
                        /etc/chrony.keys
                end
        
+               prerequires = shadow-utils systemd-units
+
                script prein
                        %{create_user}
                end
        
                script postin
-                       /bin/systemctl daemon-reload &>/dev/null
-                       /bin/systemctl enable cronyd.service &>/dev/null
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl --no-reload enable \
+                               chrony-wait.service chronyd.service >/dev/null 2>&1 || :
                end
        
                script preun
                        /bin/systemctl --no-reload disable \
-                               chrony-wait.service chronyd.service &>/dev/null
-                       /bin/systemctl stop chrony-wait.service chronyd.service &>/dev/null
+                               chrony-wait.service chronyd.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop chrony-wait.service chronyd.service >/dev/null 2>&1 || :
                end
        
                script postup
-                       /bin/systemctl daemon-reload &>/dev/null
-                       /bin/systemctl try-restart chronyd.service &>/dev/null
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart chronyd.service >/dev/null 2>&1 || :
                end
        end
 end
index bb3c5a2fa52ae1525c52d45e77e16d8c531a7876..0f3545320aca741de932f6572c3f8aa12215cf15 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = coreutils
-version    = 8.13
-release    = 2
+version    = 8.14
+release    = 1
 
 groups     = Base Build System/Base
 url        = http://www.gnu.org/software/coreutils/
index 9a78e98460f62e68c92c03c4b90edb39c6329280..3ecdae972164a258c353b2e58b62ec2dfeb65ac5 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = cups
 version    = 1.4.5
-release    = 5
+release    = 7
 
 groups     = Applications/Printing
 url        = http://cups.org/software.php
@@ -17,7 +17,7 @@ description
        by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems.
 end
 
-source_dl  =
+source_dl  = http://ftp.easysw.com/pub/cups/%{version}/
 sources    = %{thisapp}-source.tar.bz2
 
 build
@@ -74,11 +74,6 @@ build
        end
 end
 
-# XXX what is this?
-# This line has to be added at the installation of cups.
-# File: /lib/udev/rules.d/99-systemd.rules
-# Line: SUBSYSTEM=="usb", ATTR{serial}=="AL01077498", TAG+="systemd", ENV{SYSTEMD_WANTS}="cups.service"
-
 packages
        package %{name}
                requires = ghostscript
@@ -86,6 +81,8 @@ packages
        
        package %{name}-devel
                template DEVEL
+
+               requires += %{name}-libs=%{thisver}
        end
        
        package %{name}-libs
index 95921949e8151fc0b3d24a7ec248b5b503b10a7e..93b7750915aba818a41142dd8fdfc5d3322950a8 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = dbus
-version    = 1.4.0
-release    = 3
+version    = 1.4.14
+release    = 2
 
 groups     = System/Daemons
 url        = http://www.freedesktop.org/software/dbus/
@@ -13,12 +13,12 @@ license    = GPLv2+ AFL
 summary    = D-BUS message bus.
 
 description
-       D-BUS is a system for sending messages between applications. It is \
-       used both for the system-wide message bus service, and as a \
+       D-BUS is a system for sending messages between applications. It is
+       used both for the system-wide message bus service, and as a
        per-user-login-session messaging facility.
 end
 
-source_dl  =
+source_dl  = http://dbus.freedesktop.org/releases/dbus/
 
 build
        requires
@@ -55,6 +55,40 @@ end
 
 packages
        package %{name}
+               prerequires += shadow-utils
+
+               script prein
+                       getent group dbus >/dev/null || groupadd -r dbus
+                       getent passwd dbus >/dev/null || \
+                               useradd -r -g dbus -d / -s /sbin/nologin \
+                                       -c "User for dbus service" dbus
+                       exit  0
+               end
+
+               # Just search for new unit files that were just installed.
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               
+                       # The dbus service should be started on default.
+                       /bin/systemctl enable dbus.service > /dev/null 2>&1 || : 
+               end
+
+               # Disable the service that is to be removed and stop it if it is still running.
+               script preun
+                       /bin/systemctl --no-reload disable dbus.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop dbus.service >/dev/null 2>&1 || :
+               end
+
+               # Just tell systemd that unitfiles have been removed.
+               script postun
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               # Try to restart the service if it is running.
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart dbus.service >/dev/null 2>&1 || :
+               end
        end
        
        package %{name}-libs
index 1fa2b4fc3eace5facd88a92abfe321e26d369173..6d575c6cfb26220e2989bb34f65266a018ae6086 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = diffutils
-version    = 3.0
+version    = 3.2
 release    = 1
 
 groups     = Base Build Development/Tools
@@ -19,7 +19,7 @@ description
        cmp can show the characters that differ between the two files.
 end
 
-source_dl  =
+source_dl  = http://ftp.gnu.org/gnu/diffutils/
 
 build
        configure_options += \
diff --git a/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch b/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch
deleted file mode 100644 (file)
index c335090..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
-Date: 2006-10-09
-Initial Package Version: 2.8.7
-Upstream Status: Submitted - Partially accepted
-Thread starts here:
-       http://sources.redhat.com/ml/bug-gnu-utils/2000-12/msg00163.html
-Origin: ALT Linux / Openwall Owl Linux - diffutils-2.8.7-alt-tmp.diff
-Description: This patch removes the more portable and less safe use of
-tmpname(3), in preference of mkstemp(3).
-
---- diffutils-2.8.7/src/sdiff.c.orig   2004-04-12 07:44:35 +0000
-+++ diffutils-2.8.7/src/sdiff.c        2005-05-17 12:58:44 +0000
-@@ -990,13 +990,13 @@ edit (struct line_filter *left, char con
-           int fd;
-           if (tmpname)
--            tmp = fopen (tmpname, "w");
--          else
-             {
--              if ((fd = temporary_file ()) < 0)
--                perror_fatal ("mkstemp");
--              tmp = fdopen (fd, "w");
-+              unlink (tmpname);
-+              free (tmpname);
-             }
-+          if ((fd = temporary_file ()) < 0)
-+            perror_fatal ("mkstemp");
-+          tmp = fdopen (fd, "w");
-           if (! tmp)
-             perror_fatal (tmpname);
diff --git a/diffutils/patches/diffutils-2.9-i18n-1.patch b/diffutils/patches/diffutils-2.9-i18n-1.patch
deleted file mode 100644 (file)
index b6f12ef..0000000
+++ /dev/null
@@ -1,768 +0,0 @@
---- diffutils-2.9/src/diff.c   2010-02-11 10:39:17.000000000 +0100
-+++ diffutils-2.9.mod/src/diff.c       2010-02-13 15:28:22.268208253 +0100
-@@ -284,6 +284,13 @@
-   re_set_syntax (RE_SYNTAX_GREP | RE_NO_POSIX_BACKTRACKING);
-   excluded = new_exclude ();
-+#ifdef HANDLE_MULTIBYTE
-+  if (MB_CUR_MAX > 1)
-+    lines_differ = lines_differ_multibyte;
-+  else
-+#endif
-+    lines_differ = lines_differ_singlebyte;
-+
-   /* Decode the options.  */
-   while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
---- diffutils-2.9/src/diff.h   2010-02-11 10:05:57.000000000 +0100
-+++ diffutils-2.9.mod/src/diff.h       2010-02-13 15:28:22.269208190 +0100
-@@ -23,6 +23,19 @@
- #include <stdio.h>
- #include <unlocked-io.h>
-+/* For platform which support the ISO C amendement 1 functionality we
-+   support user defined character classes.  */
-+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H
-+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
-+# include <wchar.h>
-+# include <wctype.h>
-+# if defined (HAVE_MBRTOWC)
-+#  define HANDLE_MULTIBYTE      1
-+# endif
-+#endif
-+
-+#define TAB_WIDTH 8
-+
- /* What kind of changes a hunk contains.  */
- enum changes
- {
-@@ -350,7 +363,13 @@
- extern char const pr_program[];
- char *concat (char const *, char const *, char const *);
- char *dir_file_pathname (char const *, char const *);
--bool lines_differ (char const *, char const *);
-+
-+bool (*lines_differ) (char const *, char const *);
-+bool lines_differ_singlebyte (char const *, char const *);
-+#ifdef HANDLE_MULTIBYTE
-+bool lines_differ_multibyte (char const *, char const *);
-+#endif
-+
- lin translate_line_number (struct file_data const *, lin);
- struct change *find_change (struct change *);
- struct change *find_reverse_change (struct change *);
---- diffutils-2.9/src/io.c     2010-02-05 09:10:15.000000000 +0100
-+++ diffutils-2.9.mod/src/io.c 2010-02-13 15:39:59.313224273 +0100
-@@ -22,6 +22,7 @@
- #include <cmpbuf.h>
- #include <file-type.h>
- #include <xalloc.h>
-+#include <assert.h>
- /* Rotate an unsigned value to the left.  */
- #define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n)))
-@@ -194,6 +195,28 @@
\f
- /* Split the file into lines, simultaneously computing the equivalence
-    class for each line.  */
-+#ifdef HANDLE_MULTIBYTE
-+# define MBC2WC(P, END, MBLENGTH, WC, STATE, CONVFAIL)                        \
-+do                                                                    \
-+{                                                                     \
-+    mbstate_t state_bak = STATE;                                      \
-+                                                                      \
-+    CONVFAIL = 0;                                                     \
-+    MBLENGTH = mbrtowc (&WC, P, END - (char const *)P, &STATE);               \
-+                                                                      \
-+    switch (MBLENGTH)                                                 \
-+      {                                                                       \
-+      case (size_t)-2:                                                        \
-+      case (size_t)-1:                                                        \
-+      STATE = state_bak;                                              \
-+      ++CONVFAIL;                                                     \
-+        /* Fall through. */                                           \
-+      case 0:                                                         \
-+      MBLENGTH = 1;                                                   \
-+      }                                                                       \
-+}                                                                     \
-+while (0)
-+#endif
- static void
- find_and_hash_each_line (struct file_data *current)
-@@ -220,12 +243,282 @@
-   bool same_length_diff_contents_compare_anyway =
-     diff_length_compare_anyway | ignore_case;
-+#ifdef HANDLE_MULTIBYTE
-+  wchar_t   wc;
-+  size_t    mblength;
-+  mbstate_t state;
-+  int       convfail;
-+
-+  memset (&state, '\0', sizeof (mbstate_t));
-+#endif
-+
-   while (p < suffix_begin)
-     {
-       char const *ip = p;
-       h = 0;
-+#ifdef HANDLE_MULTIBYTE
-+      if (MB_CUR_MAX > 1)
-+       {
-+         wchar_t   lo_wc;
-+         char      mbc[MB_LEN_MAX];
-+         mbstate_t state_wc;
-+
-+         /* Hash this line until we find a newline.  */
-+         switch (ignore_white_space)
-+           {
-+           case IGNORE_ALL_SPACE:
-+             while (1)
-+               {
-+                 if (*p == '\n')
-+                   {
-+                     ++p;
-+                     break;
-+                   }
-+
-+                 MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
-+
-+                 if (convfail)
-+                   mbc[0] = *p++;
-+                 else if (!iswspace (wc))
-+                   {
-+                     bool flag = 0;
-+
-+                     if (ignore_case)
-+                       {
-+                         lo_wc = towlower (wc);
-+                         if (lo_wc != wc)
-+                           {
-+                             flag = 1;
-+
-+                             p += mblength;
-+                             memset (&state_wc, '\0', sizeof(mbstate_t));
-+                             mblength = wcrtomb (mbc, lo_wc, &state_wc);
-+
-+                             assert (mblength != (size_t)-1 &&
-+                                 mblength != (size_t)-2);
-+
-+                             mblength = (mblength < 1) ? 1 : mblength;
-+                           }
-+                       }
-+
-+                     if (!flag)
-+                       {
-+                         for (i = 0; i < mblength; i++)
-+                           mbc[i] =  *p++;
-+                       }
-+                   }
-+                 else
-+                   {
-+                     p += mblength;
-+                     continue;
-+                   }
-+
-+                 for (i = 0; i < mblength; i++)
-+                   h = HASH (h, mbc[i]);
-+               }
-+             break;
-+
-+           case IGNORE_SPACE_CHANGE:
-+             while (1)
-+               {
-+                 if (*p == '\n')
-+                   {
-+                     ++p;
-+                     break;
-+                   }
-+
-+                 MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
-+
-+                 if (!convfail && iswspace (wc))
-+                   {
-+                     while (1)
-+                       {
-+                         if (*p == '\n')
-+                           {
-+                             ++p;
-+                             goto hashing_done;
-+                           }
-+
-+                         p += mblength;
-+                         MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
-+                         if (convfail || (!convfail && !iswspace (wc)))
-+                           break;
-+                       }
-+                     h = HASH (h, ' ');
-+                   }
-+
-+                 /* WC is now the first non-space.  */
-+                 if (convfail)
-+                   mbc[0] = *p++;
-+                 else
-+                   {
-+                     bool flag = 0;
-+
-+                     if (ignore_case)
-+                       {
-+                         lo_wc = towlower (wc);
-+                         if (lo_wc != wc)
-+                           {
-+                             flag = 1;
-+
-+                             p += mblength;
-+                             memset (&state_wc, '\0', sizeof(mbstate_t));
-+                             mblength = wcrtomb (mbc, lo_wc, &state_wc);
-+
-+                             assert (mblength != (size_t)-1 &&
-+                                 mblength != (size_t)-2);
-+
-+                             mblength = (mblength < 1) ? 1 : mblength;
-+                           }
-+                       }
-+
-+                     if (!flag)
-+                       {
-+                         for (i = 0; i < mblength; i++)
-+                           mbc[i] = *p++;
-+                       }
-+                   }
-+
-+                 for (i = 0; i < mblength; i++)
-+                   h = HASH (h, mbc[i]);
-+               }
-+             break;
-+
-+           case IGNORE_TAB_EXPANSION:
-+               {
-+                 size_t column = 0;
-+
-+                 while (1)
-+                   {
-+                     if (*p == '\n')
-+                       {
-+                         ++p;
-+                         break;
-+                       }
-+
-+                     MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
-+
-+                     if (convfail)
-+                       {
-+                         h = HASH (h, *p++);
-+                         ++column;
-+                       }
-+                     else
-+                       {
-+                         bool flag;
-+
-+                         switch (wc)
-+                           {
-+                           case L'\b':
-+                             column -= 0 < column;
-+                             h = HASH (h, '\b');
-+                             ++p;
-+                             break;
-+
-+                           case L'\t':
-+                               {
-+                                 int repetitions;
-+
-+                                 repetitions = TAB_WIDTH - column % TAB_WIDTH;
-+                                 column += repetitions;
-+                                 do
-+                                   h = HASH (h, ' ');
-+                                 while (--repetitions != 0);
-+                                 ++p;
-+                               }
-+                             break;
-+
-+                           case L'\r':
-+                             column = 0;
-+                             h = HASH (h, '\r');
-+                             ++p;
-+                             break;
-+
-+                           default:
-+                             flag = 0;
-+                             column += wcwidth (wc);
-+                             if (ignore_case)
-+                               {
-+                                 lo_wc = towlower (wc);
-+                                 if (lo_wc != wc)
-+                                   {
-+                                     flag = 1;
-+                                     p += mblength;
-+                                     memset (&state_wc, '\0', sizeof(mbstate_t));
-+                                     mblength = wcrtomb (mbc, lo_wc, &state_wc);
-+
-+                                     assert (mblength != (size_t)-1 &&
-+                                         mblength != (size_t)-2);
-+
-+                                     mblength = (mblength < 1) ? 1 : mblength;
-+                                   }
-+                               }
-+
-+                             if (!flag)
-+                               {
-+                                 for (i = 0; i < mblength; i++)
-+                                   mbc[i] = *p++;
-+                               }
-+
-+                             for (i = 0; i < mblength; i++)
-+                               h = HASH (h, mbc[i]);
-+                           }
-+                       }
-+                   }
-+               }
-+             break;
-+
-+           default:
-+             while (1)
-+               {
-+                 if (*p == '\n')
-+                   {
-+                     ++p;
-+                     break;
-+                   }
-+
-+                 MBC2WC (p, suffix_begin, mblength, wc, state, convfail);
-+
-+                 if (convfail)
-+                   mbc[0] = *p++;
-+                 else
-+                   {
-+                     int flag = 0;
-+
-+                     if (ignore_case)
-+                       {
-+                         lo_wc = towlower (wc);
-+                         if (lo_wc != wc)
-+                           {
-+                             flag = 1;
-+                             p += mblength;
-+                             memset (&state_wc, '\0', sizeof(mbstate_t));
-+                             mblength = wcrtomb (mbc, lo_wc, &state_wc);
-+
-+                             assert (mblength != (size_t)-1 &&
-+                                 mblength != (size_t)-2);
-+
-+                             mblength = (mblength < 1) ? 1 : mblength;
-+                           }
-+                       }
-+
-+                     if (!flag)
-+                       {
-+                         for (i = 0; i < mblength; i++)
-+                           mbc[i] = *p++;
-+                       }
-+                   }
-+
-+                 for (i = 0; i < mblength; i++)
-+                   h = HASH (h, mbc[i]);
-+               }
-+           }
-+       }
-+      else
-+#endif
-+
-       /* Hash this line until we find a newline.  */
-       if (ignore_case)
-       switch (ignore_white_space)
---- diffutils-2.9/src/side.c   2010-02-05 09:10:15.000000000 +0100
-+++ diffutils-2.9.mod/src/side.c       2010-02-13 15:51:32.647221551 +0100
-@@ -77,11 +77,74 @@
-   register char const *text_limit = line[1];
-   mbstate_t mbstate = { 0 };
-+#if defined HAVE_WCHAR_H && defined HAVE_WCTYPE_H
-+  unsigned char mbc[MB_LEN_MAX];
-+  wchar_t wc;
-+  mbstate_t state, state_bak;
-+  size_t mbc_pos, mblength;
-+  int mbc_loading_flag = 0;
-+  int wc_width;
-+
-+  memset (&state, '\0', sizeof (mbstate_t));
-+#endif
-+
-   while (text_pointer < text_limit)
-     {
-       char const *tp0 = text_pointer;
-       register char c = *text_pointer++;
-+#if defined HAVE_WCHAR_H && defined HAVE_WCTYPE_H
-+      if (MB_CUR_MAX > 1 && mbc_loading_flag)
-+       {
-+         mbc_loading_flag = 0;
-+         state_bak = state;
-+         mbc[mbc_pos++] = c;
-+
-+process_mbc:
-+         mblength = mbrtowc (&wc, mbc, mbc_pos, &state);
-+
-+         switch (mblength)
-+           {
-+           case (size_t)-2:    /* Incomplete multibyte character. */
-+             mbc_loading_flag = 1;
-+             state = state_bak;
-+             break;
-+
-+           case (size_t)-1:    /* Invalid as a multibyte character. */
-+             if (in_position++ < out_bound)
-+               {
-+                 out_position = in_position;
-+                 putc (mbc[0], out);
-+               }
-+             memmove (mbc, mbc + 1, --mbc_pos);
-+             if (mbc_pos > 0)
-+               {
-+                 mbc[mbc_pos] = '\0';
-+                 goto process_mbc;
-+               }
-+             break;
-+
-+           default:
-+             wc_width = wcwidth (wc);
-+             if (wc_width < 1) /* Unprintable multibyte character. */
-+               {
-+                 if (in_position <= out_bound)
-+                   fprintf (out, "%lc", (wint_t)wc);
-+               }
-+             else              /* Printable multibyte character. */
-+               {
-+                 in_position += wc_width;
-+                 if (in_position <= out_bound)
-+                   {
-+                     out_position = in_position;
-+                     fprintf (out, "%lc", (wint_t)wc);
-+                   }
-+               }
-+           }
-+         continue;
-+       }
-+#endif
-+
-       switch (c)
-       {
-       case '\t':
---- diffutils-2.9/src/util.c   2010-02-11 10:39:17.000000000 +0100
-+++ diffutils-2.9.mod/src/util.c       2010-02-13 16:08:16.065232588 +0100
-@@ -309,7 +309,7 @@
-   outfile = 0;
- }
--\f
-+
- /* Compare two lines (typically one from each input file)
-    according to the command line options.
-    For efficiency, this is invoked only when the lines do not match exactly
-@@ -317,7 +317,7 @@
-    Return nonzero if the lines differ.  */
- bool
--lines_differ (char const *s1, char const *s2)
-+lines_differ_singlebyte (char const *s1, char const *s2)
- {
-   register char const *t1 = s1;
-   register char const *t2 = s2;
-@@ -446,7 +446,294 @@
-   return true;
- }
--\f
-+
-+#ifdef HANDLE_MULTIBYTE
-+# define MBC2WC(T, END, MBLENGTH, WC, STATE, CONVFAIL)                        \
-+do                                                                    \
-+{                                                                     \
-+    mbstate_t bak = STATE;                                            \
-+                                                                      \
-+    CONVFAIL = 0;                                                     \
-+    MBLENGTH = mbrtowc (&WC, T, END - T, &STATE);                     \
-+                                                                      \
-+    switch (MBLENGTH)                                                 \
-+      {                                                                       \
-+      case (size_t)-2:                                                        \
-+      case (size_t)-1:                                                        \
-+      STATE = bak;                                                    \
-+      ++CONVFAIL;                                                     \
-+        /* Fall through. */                                           \
-+      case 0:                                                         \
-+      MBLENGTH = 1;                                                   \
-+      }                                                                       \
-+}                                                                     \
-+while (0)
-+
-+bool
-+lines_differ_multibyte (char const *s1, char const *s2)
-+{
-+  unsigned char const *end1, *end2;
-+  unsigned char c1, c2;
-+  wchar_t wc1, wc2, wc1_bak, wc2_bak;
-+  size_t mblen1, mblen2;
-+  mbstate_t state1, state2, state1_bak, state2_bak;
-+  int convfail1, convfail2, convfail1_bak, convfail2_bak;
-+  
-+  unsigned char const *t1 = (unsigned char const *) s1;
-+  unsigned char const *t2 = (unsigned char const *) s2;
-+  unsigned char const *t1_bak, *t2_bak;
-+  size_t column = 0;
-+
-+  if (ignore_white_space == IGNORE_NO_WHITE_SPACE  && !ignore_case)
-+    {
-+      while (*t1 != '\n')
-+      if (*t1++ != * t2++)
-+        return 1;
-+      return 0;
-+    }
-+
-+  memset (&state1, '\0', sizeof (mbstate_t));
-+  memset (&state2, '\0', sizeof (mbstate_t));
-+
-+  end1 = s1 + strlen (s1);
-+  end2 = s2 + strlen (s2);
-+
-+  while (1)
-+    {
-+      c1 = *t1;
-+      c2 = *t2;
-+      MBC2WC (t1, end1, mblen1, wc1, state1, convfail1);
-+      MBC2WC (t2, end2, mblen2, wc2, state2, convfail2);
-+
-+      /* Test for exact char equality first, since it's a common case.  */
-+      if (convfail1 ^ convfail2)
-+      break;
-+      else if (convfail1 && convfail2 && c1 != c2)
-+      break;
-+      else if (!convfail1 && !convfail2 && wc1 != wc2)
-+      {
-+        switch (ignore_white_space)
-+          {
-+          case IGNORE_ALL_SPACE:
-+            /* For -w, just skip past any white space.  */
-+            while (1)
-+              {
-+                if (convfail1)
-+                  break;
-+                else if (wc1 == L'\n' || !iswspace (wc1))
-+                  break;
-+
-+                t1 += mblen1;
-+                c1 = *t1;
-+                MBC2WC (t1, end1, mblen1, wc1, state1, convfail1);
-+              }
-+
-+            while (1)
-+              {
-+                if (convfail2)
-+                  break;
-+                else if (wc2 == L'\n' || !iswspace (wc2))
-+                  break;
-+
-+                t2 += mblen2;
-+                c2 = *t2;
-+                MBC2WC (t2, end2, mblen2, wc2, state2, convfail2);
-+              }
-+            t1 += mblen1;
-+            t2 += mblen2;
-+            break;
-+
-+          case IGNORE_SPACE_CHANGE:
-+            /* For -b, advance past any sequence of white space in
-+               line 1 and consider it just one space, or nothing at
-+               all if it is at the end of the line.  */
-+            if (wc1 != L'\n' && iswspace (wc1))
-+              {
-+                size_t mblen_bak;
-+                mbstate_t state_bak;
-+
-+                do
-+                  {
-+                    t1 += mblen1;
-+                    mblen_bak = mblen1;
-+                    state_bak = state1;
-+                    MBC2WC (t1, end1, mblen1, wc1, state1, convfail1);
-+                  }
-+                while (!convfail1 && (wc1 != L'\n' && iswspace (wc1)));
-+
-+                state1 = state_bak;
-+                mblen1 = mblen_bak;
-+                t1 -= mblen1;
-+                convfail1 = 0;
-+                wc1 = L' ';
-+              }
-+
-+            /* Likewise for line 2.  */
-+            if (wc2 != L'\n' && iswspace (wc2))
-+              {
-+                size_t mblen_bak;
-+                mbstate_t state_bak;
-+
-+                do
-+                  {
-+                    t2 += mblen2;
-+                    mblen_bak = mblen2;
-+                    state_bak = state2;
-+                    MBC2WC (t2, end2, mblen2, wc2, state2, convfail2);
-+                  }
-+                while (!convfail2 && (wc2 != L'\n' && iswspace (wc2)));
-+
-+                state2 = state_bak;
-+                mblen2 = mblen_bak;
-+                t2 -= mblen2;
-+                convfail2 = 0;
-+                wc2 = L' ';
-+              }
-+
-+            if (wc1 != wc2)
-+              {
-+                if (wc2 == L' ' && wc1 != L'\n' &&
-+                    t1 > (unsigned char const *)s1 &&
-+                    !convfail1_bak && iswspace (wc1_bak))
-+                  {
-+                    t1 = t1_bak;
-+                    wc1 = wc1_bak;
-+                    state1 = state1_bak;
-+                    convfail1 = convfail1_bak;
-+                    continue;
-+                  }
-+                if (wc1 == L' ' && wc2 != L'\n'
-+                    && t2 > (unsigned char const *)s2
-+                    && !convfail2_bak && iswspace (wc2_bak))
-+                  {
-+                    t2 = t2_bak;
-+                    wc2 = wc2_bak;
-+                    state2 = state2_bak;
-+                    convfail2 = convfail2_bak;
-+                    continue;
-+                  }
-+              }
-+
-+            t1_bak = t1;                t2_bak = t2;
-+            wc1_bak = wc1;              wc2_bak = wc2;
-+            state1_bak = state1;        state2_bak = state2;
-+            convfail1_bak = convfail1;  convfail2_bak = convfail2;
-+
-+            if (wc1 == L'\n')
-+              wc1 = L' ';
-+            else
-+              t1 += mblen1;
-+
-+            if (wc2 == L'\n')
-+              wc2 = L' ';
-+            else
-+              t2 += mblen2;
-+
-+            break;
-+
-+          case IGNORE_TAB_EXPANSION:
-+            if ((wc1 == L' ' && wc2 == L'\t')
-+                || (wc1 == L'\t' && wc2 == L' '))
-+              {
-+                size_t column2 = column;
-+
-+                while (1)
-+                  {
-+                    if (convfail1)
-+                      {
-+                        ++t1;
-+                        break;
-+                      }
-+                    else if (wc1 == L' ')
-+                      column++;
-+                    else if (wc1 == L'\t')
-+                      column += TAB_WIDTH - column % TAB_WIDTH;
-+                    else
-+                      {
-+                        t1 += mblen1;
-+                        break;
-+                      }
-+
-+                    t1 += mblen1;
-+                    c1 = *t1;
-+                    MBC2WC (t1, end1, mblen1, wc1, state1, convfail1);
-+                  }
-+
-+                while (1)
-+                  {
-+                    if (convfail2)
-+                      {
-+                        ++t2;
-+                        break;
-+                      }
-+                    else if (wc2 == L' ')
-+                      column2++;
-+                    else if (wc2 == L'\t')
-+                      column2 += TAB_WIDTH - column2 % TAB_WIDTH;
-+                    else
-+                      {
-+                        t2 += mblen2;
-+                        break;
-+                      }
-+
-+                    t2 += mblen2;
-+                    c2 = *t2;
-+                    MBC2WC (t2, end2, mblen2, wc2, state2, convfail2);
-+                  }
-+
-+                if (column != column2)
-+                  return 1;
-+              }
-+            else
-+              {
-+                t1 += mblen1;
-+                t2 += mblen2;
-+              }
-+            break;
-+
-+          case IGNORE_NO_WHITE_SPACE:
-+            t1 += mblen1;
-+            t2 += mblen2;
-+            break;
-+          }
-+
-+        /* Lowercase all letters if -i is specified.  */
-+        if (ignore_case)
-+          {
-+            if (!convfail1)
-+              wc1 = towlower (wc1);
-+            if (!convfail2)
-+              wc2 = towlower (wc2);
-+          }
-+
-+        if (convfail1 ^ convfail2)
-+          break;
-+        else if (convfail1 && convfail2 && c1 != c2)
-+          break;
-+        else if (!convfail1 && !convfail2 && wc1 != wc2)
-+          break;
-+      }
-+      else
-+      {
-+        t1_bak = t1;                  t2_bak = t2;
-+        wc1_bak = wc1;                wc2_bak = wc2;
-+        state1_bak = state1;          state2_bak = state2;
-+        convfail1_bak = convfail1;    convfail2_bak = convfail2;
-+
-+        t1 += mblen1;                 t2 += mblen2;
-+      }
-+      
-+      if (!convfail1 && wc1 == L'\n')
-+      return 0;
-+
-+      column += convfail1 ? 1 :
-+      (wc1 == L'\t') ? TAB_WIDTH - column % TAB_WIDTH : wcwidth (wc1);
-+    }
-+
-+  return 1;
-+}
-+#endif
-+
- /* Find the consecutive changes at the start of the script START.
-    Return the last link before the first gap.  */
diff --git a/diffutils/patches/diffutils-cmp-s-empty.patch b/diffutils/patches/diffutils-cmp-s-empty.patch
new file mode 100644 (file)
index 0000000..bc1c6b4
--- /dev/null
@@ -0,0 +1,20 @@
+diff -up diffutils-2.8.1/src/cmp.c.cmp-s-empty diffutils-2.8.1/src/cmp.c
+--- diffutils-2.8.1/src/cmp.c.cmp-s-empty      2002-04-05 21:37:31.000000000 +0100
++++ diffutils-2.8.1/src/cmp.c  2010-06-25 14:56:08.464802321 +0100
+@@ -316,12 +316,15 @@ main (int argc, char **argv)
+   /* If only a return code is needed,
+      and if both input descriptors are associated with plain files,
++     and if both files are larger than 0 bytes (procfs files are always 0),
+      conclude that the files differ if they have different sizes
+      and if more bytes will be compared than are in the smaller file.  */
+   if (comparison_type == type_status
+       && S_ISREG (stat_buf[0].st_mode)
+-      && S_ISREG (stat_buf[1].st_mode))
++      && S_ISREG (stat_buf[1].st_mode)
++      && stat_buf[0].st_size > 0
++      && stat_buf[1].st_size > 0)
+     {
+       off_t s0 = stat_buf[0].st_size - file_position (0);
+       off_t s1 = stat_buf[1].st_size - file_position (1);
index 2539b25c1c0bfe17879d52cb1120e07f79fc9a50..212bf7bb7cf2edc690732ec9fd86a414add82a21 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = ebtables
 version    = v2.0.9-2
-release    = 1
+release    = 2
 
 groups     = Networking/Tools
 url        = http://ebtables.sourceforge.net/
@@ -35,8 +35,6 @@ build
 
                rm -vfr %{BUILDROOT}/etc/{init.d,sysconfig}
        end
-
-       export PKG_REQUIRES_FILTER = libebt
 end
 
 quality-agent
@@ -47,5 +45,8 @@ end
 
 packages
        package %{name}
+               filter_requires
+                       libebt
+               end
        end
 end
index c193681d6546c8f5d3c4d5275b874119e0772a7f..d34169be315f7357bfcebce0058ecc0264808d4c 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = file
-version    = 5.07
+version    = 5.09
 release    = 1
 
 groups     = Base Build System/Tools
@@ -19,7 +19,7 @@ description
        different graphics formats.
 end
 
-source_dl  =
+source_dl  = ftp://ftp.astron.com/pub/file/
 
 build
        requires
index 9922894b3ce300f789eb7180bb8f15ae72b28e27..b31090001c92faffdd5da8559b2789fc7e04efb7 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = ghostscript
-version    = 9.02
+version    = 9.04
 release    = 1
 
 groups     = Applications/Printing
index 8e35ca8fd4dd8e9a2d7cce21a5ddbf7f3f362976..662335975069fb947fa592d181b21486b6b32fcb 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = gnupg
-version    = 2.0.17
+version    = 2.0.18
 release    = 1
 
 groups     = Security/Tools
@@ -20,7 +20,7 @@ description
        standard as described by several RFCs.
 end
 
-source_dl  =
+source_dl  = ftp://ftp.gnupg.org/gcrypt/gnupg/
 sources    = %{thisapp}.tar.bz2
 
 build
@@ -41,5 +41,4 @@ end
 
 packages
        package %{name}
-       end
 end
index e321030d7938d33632e2cd96593c56d86d05d30d..dadca531c24ee3326acbf711651fcacb6ef9f430 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = gnutls
-version    = 3.0.3
-release    = 1
+version    = 3.0.4
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.gnu.org/software/gnutls/
@@ -25,7 +25,7 @@ sources    = %{thisapp}.tar.xz
 build
        requires
                libtasn1-devel
-               nettle-devel
+               nettle-devel>=2.4
                p11-kit-devel>=0.4
                zlib-devel
        end
@@ -45,6 +45,7 @@ end
 packages
        package %{name}
                requires
+                       nettle>=2.4
                        p11-kit>=0.4
                end
        end
similarity index 100%
rename from grub/grub.default
rename to grub/default/grub
index 4adffac602c70dcfcd057d0788a97148e166003e..409ce33e64ddf87702cc7bbb75eba99d39807fcb 100644 (file)
@@ -5,7 +5,8 @@
 
 name       = grub
 version    = 1.99
-release    = 1
+release    = 2
+sup_arches = i686
 
 groups     = Base System/Boot
 url        = http://www.gnu.org/software/grub/
@@ -51,6 +52,9 @@ build
                # Install splash background
                mkdir -pv %{BUILDROOT}/boot/grub
                install %{DIR_SOURCE}/splash.png %{BUILDROOT}/boot/grub
+
+               # Install empty configuration file.
+               touch %{BUILDROOT}/boot/grub/grub.cfg
        end
 end
 
@@ -68,6 +72,11 @@ packages
                        /usr/share/X11/fonts/misc/unifont.pcf.gz
                end
 
+               configfiles
+                       /boot/grub/grub.cfg
+                       /etc/default/grub
+               end
+
                # Generate grub compatible font for graphical boot menu
                # This only converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters
                script postin
index ca0e7af051dd1dc19497248f8cf0065e3c56cfcf..dce2238b4ec76914fc8cb021cbafdff4471e76b2 100644 (file)
@@ -6,7 +6,7 @@
 name       = initscripts
 epoch      = 1
 version    = 2.99
-release    = 6
+release    = 8
 
 groups     = Base System/Boot
 url        =
@@ -76,5 +76,18 @@ packages
                        udev
                        util-linux
                end
+
+               prerequires = coreutils shadow-utils
+
+               script prein
+                       groupadd -g 22 -r -f utmp
+               end
+
+               script postin
+                       touch /var/log/{b,w}tmp /var/run/utmp
+                       chown root:utmp /var/log/{b,w}tmp /var/run/utmp
+                       chmod 664 /var/log/wtmp /var/run/utmp
+                       chmod 600 /var/log/btmp
+               end
        end
 end
index 9a979e40666489fddbafc3b7fafed84113ac8e41..a6b0f3135db9c3ba730ffacab1ca7e7064e8a4ff 100644 (file)
@@ -1,5 +1,5 @@
 
-PROGS = console_init ipcalc securetty
+PROGS = ipcalc securetty
 
 CC = gcc
 CFLAGS += -D_GNU_SOURCE $(shell pkg-config --cflags glib-2.0)
@@ -15,7 +15,6 @@ test: ipcalc
 install: $(PROGS)
        # Install binaries
        -mkdir -pv $(DESTDIR)/lib/udev $(DESTDIR)/{,s}bin
-       install -v -m 755 console_init $(DESTDIR)/lib/udev/
        install -v -m 755 ipcalc $(DESTDIR)/bin
        install -v -m 755 securetty $(DESTDIR)/sbin
 
@@ -25,9 +24,6 @@ install: $(PROGS)
        install -v -m 644 ipcalc.1 $(DESTDIR)/usr/share/man/man1
        install -v -m 644 securetty.8 $(DESTDIR)/usr/share/man/man8
 
-console_init: console_init.o shvar.o
-       $(CC) $(LDFLAGS) $(shell pkg-config --libs glib-2.0) -o $@ $?
-
 ipcalc: ipcalc.o
        $(CC) $(LDFLAGS) -o $@ $< -lpopt
 
diff --git a/initscripts/src/console_init.c b/initscripts/src/console_init.c
deleted file mode 100644 (file)
index 22083a8..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2008-2009 Red Hat, Inc. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- */
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <linux/kd.h>
-
-#include "shvar.h"
-
-static char *lang = NULL;
-static char *font = NULL;
-static char *acm = NULL;
-static char *unimap = NULL;
-static char *keymap = NULL;
-
-static int linux_console(int fd) {
-       unsigned char twelve = 12;
-
-       if (ioctl(fd, TIOCLINUX, &twelve) >= 0) 
-               return 1;
-       return 0;
-}
-
-static int configured_as_utf8() {
-        shvarFile *i18nfile = NULL;
-
-        if ((i18nfile = svNewFile("/etc/sysconfig/i18n")) == NULL)
-                return 1; /* assume UTF-8 */
-
-        lang = svGetValue(i18nfile, "LANG");
-        font = svGetValue(i18nfile, "SYSFONT");
-        acm = svGetValue(i18nfile, "SYSFONTACM");
-        unimap = svGetValue(i18nfile, "UNIMAP");
-        svCloseFile(i18nfile);
-        if (!lang)
-                return 1;
-        if (g_str_has_suffix(lang,".utf8") || g_str_has_suffix(lang,".UTF-8"))
-                return 1;
-       return 0;
-}
-
-static int read_keymap() {
-       shvarFile *keyboard = NULL;
-       char *tmp;
-       struct stat sb;
-       
-       if (!stat("/etc/sysconfig/console/default.kmap",&sb)) {
-               keymap = "/etc/sysconfig/console/default.kmap";
-               return 0;
-       }
-
-       if ((keyboard = svNewFile("/etc/sysconfig/keyboard")) == NULL)
-               return 0;
-
-       tmp = svGetValue(keyboard, "KEYMAP");
-       if (tmp)
-               keymap = tmp;
-       tmp = svGetValue(keyboard, "KEYTABLE");
-       if (tmp) {
-               if (keymap) free(keymap);
-               asprintf(&keymap, "%s.map", tmp);
-       }
-       return 0;
-}
-
-static void set_font(char *device) {
-       int pid;
-       
-       if ( (pid = fork()) == 0) {
-               char *args[] = { "setfont", "latarcyrheb-sun16", "-C", NULL,
-                                NULL, NULL, NULL, NULL, NULL };
-
-               if (font)
-                       args[1] = font;
-               args[3] = device;
-               if (acm) {
-                       args[4] = "-m"; 
-                       args[5] = acm;
-                       if (unimap) {
-                               args[6] = "-u";
-                               args[7] = unimap;
-                       }
-               } else  if (unimap) {
-                       args[4] = "-u";
-                       args[5] = unimap;
-               }
-               execv("/bin/setfont", args);
-               exit(1);
-       }
-}
-
-static void set_keyboard(int fd, int utf8) {
-       if (ioctl(fd, KDSKBMODE, utf8 ? K_UNICODE : K_XLATE))
-               perror("could not set keyboard mode");
-}
-
-static void set_terminal(int fd, int utf8) {
-       if (utf8)
-               write(fd, "\033%G", 3);
-       else
-               write(fd, "\033%@", 3);
-}
-
-static void set_keymap(int fd, int utf8) {
-       int pid;
-       
-       if ((pid = fork()) == 0) {
-               char *args[] = { "loadkeys", "-q", NULL, NULL, NULL };
-               dup2(fd, 0);
-               dup2(fd, 1);
-               
-               if (utf8) {
-                       args[2] = "-u";
-                       args[3] = keymap;
-               } else {
-                       args[2] = keymap;
-               }
-               execv("/bin/loadkeys", args);
-               exit(1);
-       }
-}
-
-int main(int argc, char **argv) {
-       char *device;
-       int dev;
-
-       if (argc < 2) {
-               printf("usage: console_init <device>\n");
-               exit(1);
-       }
-       chdir("/dev");
-       device = argv[1];
-       dev = open(device, O_RDWR);
-       if (linux_console(dev)) {
-               int utf8 = configured_as_utf8();
-
-               set_keyboard(dev, utf8);
-               set_terminal(dev, utf8);
-               set_font(device);
-               read_keymap();
-               if (keymap)
-                       set_keymap(dev,utf8);
-       }
-       return 0;
-}
diff --git a/initscripts/udev/10-console.rules b/initscripts/udev/10-console.rules
deleted file mode 100644 (file)
index e7609c5..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION!="add", GOTO="console_end"
-
-# Console initialization - keyboard, font, etc.
-KERNEL=="tty0",                RUN+="/lib/udev/console_init %k"
-
-# Check and set up serial and serial-like consoles if necessary
-KERNEL=="console",     RUN+="/lib/udev/console_check %k"
-KERNEL=="ttySG*",      RUN+="/lib/udev/console_check %k"
-KERNEL=="xvc*",                RUN+="/lib/udev/console_check %k"
-KERNEL=="hvsi*",       RUN+="/lib/udev/console_check %k"
-KERNEL=="hvc*",                RUN+="/lib/udev/console_check %k"
-
-LABEL="console_end"
index 23608e23ce6c829a7501c3ab48a01ccccf8e53ac..f7741c760047b335624b2493903848ff93db6a36 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = intltool
 version    = 0.40.5
-release    = 1
+release    = 2
 arch       = noarch
 
 groups     = Localization/Tools
@@ -26,7 +26,7 @@ build
        requires
                expat-devel
                gettext
-               perl-XML-Parser
+               perl(XML::Parser)
        end
 
        configure_options += \
@@ -35,6 +35,9 @@ end
 
 packages
        package %{name}
-               requires = gettext perl-XML-Parser
+               requires
+                       gettext
+                       perl(XML::Parser)
+               end
        end
 end
index daed6ac6269880f22452a263778bcc8e78752d7b..e521a6098b933c5e1833bac4063115326b770869 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kbd
-version    = 1.15
+version    = 1.15.3
 release    = 1
 epoch      = 1
 
@@ -14,8 +14,8 @@ license    = GPLv2+
 summary    = Tools for configuring the console (keyboard, virtual terminals, etc.).
 
 description
-       The kbd package contains tools for managing a Linux \
-       system's console's behavior, including the keyboard, the screen \
+       The kbd package contains tools for managing a Linux
+       system's console's behavior, including the keyboard, the screen
        fonts, the virtual terminals and font files.
 end
 
@@ -24,13 +24,43 @@ sources   += kbd-latarcyrheb-16-fixed.tar.bz2
 sources   += kbd-latsun-fonts.tar.bz2
 
 build
+       requires
+               bison
+               flex
+               gettext
+       end
+
        configure_options += \
-               --datadir=/lib/kbd
-       
-       # Adding our own fonts
+               --datadir=/lib/kbd \
+               --disable-rpath \
+               --enable-nls
+
        prepare_cmds
+               # Adding our own fonts.
+               cd %{DIR_APP}
                %{MACRO_EXTRACT} %{DIR_DL}/kbd-latarcyrheb-16-fixed.tar.bz2
                %{MACRO_EXTRACT} %{DIR_DL}/kbd-latsun-fonts.tar.bz2
+
+               # 7-bit maps are obsolete; so are non-euro maps
+               cd %{DIR_APP}/data/keymaps/i386
+               mv qwerty/fi.map qwerty/fi-old.map
+               cp qwerty/fi-latin9.map qwerty/fi.map
+               cp qwerty/pt-latin9.map qwerty/pt.map
+               cp qwerty/sv-latin1.map qwerty/se-latin1.map
+               mv azerty/fr.map azerty/fr-old.map
+               cp azerty/fr-latin9.map azerty/fr.map
+               cp azerty/fr-latin9.map azerty/fr-latin0.map
+
+               # Rename conflicting keymaps
+               mv dvorak/no.map dvorak/no-dvorak.map
+               mv fgGIod/trf.map fgGIod/trf-fgGIod.map
+               mv olpc/es.map olpc/es-olpc.map
+               mv olpc/pt.map olpc/pt-olpc.map
+               mv qwerty/cz.map qwerty/cz-qwerty.map
+
+               # remove obsolete "gr" translation
+               cd %{DIR_APP}/po
+               rm -f gr.po gr.gmo
        end
 
        install_cmds
diff --git a/kbd/patches/kbd-1.15-po.patch b/kbd/patches/kbd-1.15-po.patch
deleted file mode 100644 (file)
index 0221f60..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in
---- kbd-1.15/po/Makefile.in_old        2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/po/Makefile.in    2008-12-09 15:35:58.000000000 +0100
-@@ -4,10 +4,10 @@ srcdir = @srcdir@
- prefix        = @prefix@
- datarootdir   = @datarootdir@
--datadir       = @datadir@
--localedir     = $(DESTDIR)$(datadir)/locale
--gnulocaledir  = $(DESTDIR)$(datadir)/locale
--gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
-+datadir       = $(DESTDIR)@datadir@
-+localedir     = $(DESTDIR)@localedir@
-+gnulocaledir  = $(DESTDIR)@localedir@
-+gettextsrcdir = $(datadir)/gettext/po
- FOREIGN       = @FOREIGN@
- HAVE_XGETTEXT = @HAVE_XGETTEXT@
-@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL)
- COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
- # Enter here all .po files
--POFILES =  cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
-+POFILES =  cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
-  ro.po ru.po sv.po tr.po
- # the same but with .gmo
--GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
-+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
-  pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
- CATALOGS = $(GMOFILES)
diff --git a/kbd/patches/kbd-1.15-quiet_doc.patch b/kbd/patches/kbd-1.15-quiet_doc.patch
deleted file mode 100644 (file)
index eca867b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in
---- kbd-1.15/man/man1/loadkeys.1.in_old        2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/man/man1/loadkeys.1.in    2009-03-05 13:11:08.000000000 +0100
-@@ -19,6 +19,8 @@ loadkeys \- load keyboard translation ta
- ] [
- .I -m --mktable
- ] [
-+.I -q --quiet
-+] [
- .I -s --clearstrings
- ] [
- .I -v --verbose
-@@ -148,6 +150,10 @@ command (and does not modify the current
- .B loadkeys
- prints its version number and a short usage message to the programs
- standard error output and exits.
-+.TP
-+.B \-q \-\-quiet
-+.B loadkeys
-+suppresses all normal output.
- .SH WARNING
- Note that anyone having read access to
- .B /dev/console
-diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c
---- kbd-1.15/src/loadkeys.c_old        2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/src/loadkeys.c    2009-03-05 13:09:00.000000000 +0100
-@@ -1966,6 +1966,7 @@ usage(void) {
- "  -d --default       load \"%s\"\n"
- "  -h --help          display this help text\n"
- "  -m --mktable       output a \"defkeymap.c\" to stdout\n"
-+"  -q --quiet         suppress all normal output\n"
- "  -s --clearstrings  clear kernel string table\n"
- "  -u --unicode       implicit conversion to Unicode\n"
- "  -v --verbose       report the changes\n"), PACKAGE_VERSION, DEFMAP);
diff --git a/kbd/patches/kbd-1.15-sparc.patch b/kbd/patches/kbd-1.15-sparc.patch
deleted file mode 100644 (file)
index a858a25..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
---- kbd-1.15/man/man8/kbdrate.8_old    2008-12-10 14:20:33.000000000 +0100
-+++ kbd-1.15/man/man8/kbdrate.8        2008-12-10 14:41:10.000000000 +0100
-@@ -22,7 +22,7 @@ Using
- without any options will reset the repeat rate to 10.9 characters per second (cps)
- and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
- These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
--to 5 cps and the delay to 200 ms.
-+to 20 cps and the delay to 200 ms.
- .SH OPTIONS
- .TP
-@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa
- .I /etc/rc.local
- .br
- .I /dev/port
-+.br
-+.I /dev/kbd
-diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
---- kbd-1.15/src/kbdrate.c_old 2008-12-10 14:00:25.000000000 +0100
-+++ kbd-1.15/src/kbdrate.c     2008-12-10 14:20:11.000000000 +0100
-@@ -77,7 +77,6 @@ beats rebuilding the kernel!
- #ifdef __sparc__
- #include <asm/param.h>
--#include <asm/kbio.h>
- #endif
- #ifndef KDKBDREP
-@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, 
- static int
- KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
-+#if defined(KDKBDREP) && !defined(__sparc__)
-       /*
-        * This ioctl is defined in <linux/kd.h> but is not
-        * implemented anywhere - must be in some m68k patches.
-+         * We cannot blindly try unimplemented ioctls on sparc64 -
-+         * the 32<->64bit transition layer does not like it.
-        * Since 2.4.9 also on i386.
--       */
-+         */
-+
-       struct my_kbd_repeat kbdrep_s;
-       /* don't change, just test */
-@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
-                       rate, kbdrep_s.delay );
-       return 1;                       /* success! */
-+#else /* no KDKBDREP or __sparc__ */
-+        return 0;
-+#endif /* KDKBDREP */
- }
- static int
-@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
- int
- main( int argc, char **argv ) {
- #ifdef __sparc__
--      double      rate = 5.0;      /* Default rate */
-+        double      rate = 20.0;      /* Default rate */
-       int         delay = 200;     /* Default delay */
- #else
-       double      rate = 10.9;     /* Default rate */
-@@ -272,7 +278,9 @@ main( int argc, char **argv ) {
-       /* The ioport way */
-+        /* The ioport way - will crash on sparc */
-+#ifndef __sparc__
-       for (i = 0; i < RATE_COUNT; i++)
-               if (rate * 10 >= valid_rates[i]) {
-                       value &= 0x60;
-@@ -335,5 +343,7 @@ main( int argc, char **argv ) {
-                       valid_rates[value & 0x1f] / 10.0,
-                       valid_delays[ (value & 0x60) >> 5 ] );
-+#endif
-+
-       return 0;
- }
-diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c
---- kbd-1.15/src/setleds.c_old 2008-12-10 14:00:02.000000000 +0100
-+++ kbd-1.15/src/setleds.c     2008-12-10 14:00:16.000000000 +0100
-@@ -14,10 +14,6 @@
- #include "nls.h"
- #include "version.h"
--#ifdef __sparc__
--#include <asm/kbio.h>
--#endif
--
- static void
- usage(void)
- {
diff --git a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch b/kbd/patches/kbd-1.15.3-dumpkeys-man.patch
new file mode 100644 (file)
index 0000000..e77718b
--- /dev/null
@@ -0,0 +1,18 @@
+diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.in
+--- kbd-1.15.3/man/man1/dumpkeys.1.in.orig     2011-08-23 13:06:16.905892768 +0200
++++ kbd-1.15.3/man/man1/dumpkeys.1.in  2011-08-23 13:15:18.264853435 +0200
+@@ -156,6 +156,14 @@ output of
+ .BR dumpkeys .
+ .LP
+ .TP
++.B \-1 \-\-separate-lines
++This forces
++.B dumpkeys
++to write one line per (modifier,keycode) pair. It prefixes the word
++.I plain
++for plain keycodes.
++.LP
++.TP
+ .B \-\-funcs-only
+ When this option is given,
+ .B dumpkeys
diff --git a/kbd/patches/kbd-1.15.3-fix-es-translation.patch b/kbd/patches/kbd-1.15.3-fix-es-translation.patch
new file mode 100644 (file)
index 0000000..9d43d8d
--- /dev/null
@@ -0,0 +1,12 @@
+diff -up kbd-1.15.3/po/es.po.orig kbd-1.15.3/po/es.po
+--- kbd-1.15.3/po/es.po.orig   2011-08-22 15:18:35.262343023 +0200
++++ kbd-1.15.3/po/es.po        2011-08-22 15:19:14.844340262 +0200
+@@ -1363,7 +1363,7 @@ msgstr "No se encontró nada que guardar
+ #: src/setfont.c:682
+ #, c-format
+ msgid "Saved %d-char %dx%d font file on %s\n"
+-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
+ #: src/setkeycodes.c:21
+ #, c-format
index 01b2f6989354ca8d74c4cbe84eb6d554a427491f..fd5121edf1f805e7b5ab0e97b4fc744c1c87325a 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.0.4
-release    = 2
+release    = 4
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -22,7 +22,7 @@ description
 end
 
 # Version helper variables.
-localversion = -%{DISTRO_SNAME}%{release}
+localversion = -%{release}.%{DISTRO_DISTTAG}.%{DISTRO_ARCH}
 fullver      = %{version}%{localversion}
 
 sources      = %{thisapp}.tar.gz
@@ -97,6 +97,14 @@ packages
                        dracut
                        linux-firmware
                end
+
+               script posttransin
+                       dracut /boot/initramfs-%{fullver}.img %{fullver}
+               end
+
+               script preun
+                       rm -f /boot/initramfs-%{fullver}.img
+               end
        end
        
        package kernel-headers
index 5b5f1ed5bae03492bb6b901c7aa2671aa084d8e8..592984368b96cf075b3d171c8930051a8d7ca2b0 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libcap
-version    = 2.19
+version    = 2.22
 release    = 1
 
 groups     = System/Libraries
@@ -13,7 +13,7 @@ license    = LGPL2+
 summary    = Library for getting and setting POSIX.1e capabilities.
 
 description
-       libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) \
+       libcap is a library for getting and setting POSIX.1e (formerly POSIX 6)
        draft 15 capabilities.
 end
 
@@ -45,8 +45,7 @@ end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-devel
                template DEVEL
        end
diff --git a/libcap/patches/libcap-2.16-build-system-fixes.patch b/libcap/patches/libcap-2.16-build-system-fixes.patch
deleted file mode 100644 (file)
index e82975b..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-From 7ee197885e113878aedab58bdda80302e42aff4c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 16 Nov 2008 09:10:31 -0500
-Subject: [PATCH] build system fixes
-
-This touches up the homebrewed build system to work much better "out of the
-box" for people.  Specifically:
-       - allow toolchain vars to be set via environment
-               - CC / BUILD_CC / AR / RANLIB
-               - CFLAGS / CPPFLAGS / LDFLAGS
-       - split CPPFLAGS out of CFLAGS
-       - break -fPIC out of global CFLAGS and only use where needed
-       - use LDLIBS for libraries, not LDFLAGS
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Make.Rules       |   28 ++++++++++++++--------------
- libcap/Makefile  |   11 ++++++-----
- pam_cap/Makefile |    6 +++---
- progs/Makefile   |    2 +-
- 4 files changed, 24 insertions(+), 23 deletions(-)
-
-diff --git a/Make.Rules b/Make.Rules
-index 6e63a5b..32cb5ea 100644
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -42,27 +42,27 @@ MINOR=16
- # Compilation specifics
--KERNEL_HEADERS := $(topdir)/libcap/include
--IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
--
--CC := gcc
--CFLAGS := -O2
--BUILD_CC := $(CC)
--BUILD_CFLAGS := $(CFLAGS) $(IPATH)
--AR := ar
--RANLIB := ranlib
--DEBUG = -g #-DDEBUG
--WARNINGS=-fPIC -Wall -Wwrite-strings \
-+CC ?= gcc
-+BUILD_CC ?= $(CC)
-+AR ?= ar
-+RANLIB ?= ranlib
-+CFLAGS ?= -O2
-+BUILD_CFLAGS ?= -O2 -pipe
-+WARNINGS=-Wall -Wwrite-strings \
-         -Wpointer-arith -Wcast-qual -Wcast-align \
-         -Wstrict-prototypes -Wmissing-prototypes \
-         -Wnested-externs -Winline -Wshadow
- LD=$(CC) -Wl,-x -shared
--LDFLAGS := #-g
-+LDFLAGS ?= #-g
--SYSTEM_HEADERS = /usr/include
-+KERNEL_HEADERS = $(topdir)/libcap/include
-+LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
-+CPPFLAGS += $(LIBCAP_CPPFLAGS)
-+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
- INCS=$(topdir)/libcap/include/sys/capability.h
- LDFLAGS += -L$(topdir)/libcap
--CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
-+CPPFLAGS += -Dlinux
-+CFLAGS += $(WARNINGS)
- PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
- INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
- DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
-diff --git a/libcap/Makefile b/libcap/Makefile
-index 8a61752..cf99523 100644
---- a/libcap/Makefile
-+++ b/libcap/Makefile
-@@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text
- # no support).
- ifeq ($(LIBATTR),yes)
- FILES += cap_file
--LDFLAGS += -lattr
-+LDLIBS += -lattr
- endif
- INCLS=libcap.h cap_names.h $(INCS)
-@@ -24,6 +24,7 @@ OBJS=$(addsuffix .o, $(FILES))
- MAJLIBNAME=$(LIBNAME).$(VERSION)
- MINLIBNAME=$(MAJLIBNAME).$(MINOR)
- GPERF_OUTPUT = _caps_output.gperf
-+CFLAGS += -fPIC
- all: $(MINLIBNAME) $(STALIBNAME)
-@@ -33,7 +34,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT)
- endif
- _makenames: _makenames.c cap_names.list.h
--      $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+      $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
- cap_names.h: _makenames
-       ./_makenames > cap_names.h
-@@ -50,15 +51,15 @@ $(STALIBNAME): $(OBJS)
-       $(RANLIB) $@
- $(MINLIBNAME): $(OBJS)
--      $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^
-+      $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS)
-       ln -sf $(MINLIBNAME) $(MAJLIBNAME)
-       ln -sf $(MAJLIBNAME) $(LIBNAME)
- %.o: %.c $(INCLS)
--      $(CC) $(CFLAGS) -c $< -o $@
-+      $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
--      $(CC) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
-+      $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
- install: all
-       mkdir -p -m 0755 $(INCDIR)/sys
-diff --git a/pam_cap/Makefile b/pam_cap/Makefile
-index eae88ed..bef59d2 100644
---- a/pam_cap/Makefile
-+++ b/pam_cap/Makefile
-@@ -14,13 +14,13 @@ install: all
-       install -m 0755 pam_cap.so $(LIBDIR)/security
- pam_cap.so: pam_cap.o
--      $(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS)
-+      $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) -lpam
- pam_cap.o: pam_cap.c
--      $(CC) $(CFLAGS) -c $< -o $@
-+      $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- testcompile: test.c pam_cap.o
--      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS)
-+      $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS)
- clean:
-       rm -f *.o *.so testcompile *~
-diff --git a/progs/Makefile b/progs/Makefile
-index a1542dc..612cf86 100644
---- a/progs/Makefile
-+++ b/progs/Makefile
-@@ -22,7 +22,7 @@ $(BUILD): %: %.o
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
- %.o: %.c $(INCS)
--      $(CC) $(CFLAGS) -c $< -o $@
-+      $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- install: all
-       mkdir -p -m 0755 $(SBINDIR)
--- 
-1.6.0.4
-
diff --git a/libcap/patches/libcap-2.16-headerfix.patch b/libcap/patches/libcap-2.16-headerfix.patch
deleted file mode 100644 (file)
index ae6eb28..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libcap-2.16/libcap/include/sys/capability.h.incfix libcap-2.16/libcap/include/sys/capability.h
---- libcap-2.16/libcap/include/sys/capability.h.incfix 2009-03-22 17:54:02.000000000 +0100
-+++ libcap-2.16/libcap/include/sys/capability.h        2009-03-22 17:54:09.000000000 +0100
-@@ -19,7 +19,7 @@ extern "C" {
-  * information for the user library.
-  */
--#include <sys/types.h>
-+#include <linux/types.h>
- #include <stdint.h>
- /*
index 3012a96e0fe0125b457d188d1f81384c1922c53f..57192cb3eb75540938aa8e66a1d489d64ab4aaf8 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = libtool
 version    = 2.4
-release    = 1
+release    = 2
 
 groups     = Build System/Libraries
 url        = http://www.gnu.org/software/libtool/
@@ -19,25 +19,19 @@ description
        interface which simplifies the process of using shared libraries.
 end
 
-source_dl  =
+source_dl  = http://ftp.gnu.org/gnu/libtool/
 
 packages
        package %{name}
-       
-       package %{name}-devel
-               template DEVEL
-
-               requires = libtool=%{thisver}   
 
-               # Overwrite filelist that /usr/share/aclocal will be in main package
-               files
-                       /usr/include
-                       /usr/lib*/lib*.so
-                       /usr/share/libtool/libltdl
-               end
-       end
-       
        package %{name}-libs
                template LIBS
        end
+
+       package %{name}-devel
+               template DEVEL
+
+               # /usr/share/aclocal must be in main package.
+               files += !/usr/share/aclocal
+       end
 end
index 0aac74875546f572a15b935427276d10bfc6bf6f..917afd02db561d852d6b847c5205d85f1edcffc9 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = lzo
-version    = 2.05
+version    = 2.06
 release    = 1
 
 groups     = Applications/Compression
@@ -20,7 +20,7 @@ description
        while still decompressing at this very high speed.
 end
 
-source_dl  =
+source_dl  = http://www.oberhumer.com/opensource/lzo/download/
 
 build
        requires
@@ -34,8 +34,7 @@ end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-devel
                template DEVEL
        end
index 8f05558f3e29965f3f8b3e1e4164b41b0b9d33d0..2728fa7b1de611e588acf27555b256b6c9c2d9a6 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = man-pages
-version    = 3.23
+version    = 3.35
 release    = 1
 arch       = noarch
 
index dee107de310098435e19662fb0624a60c50ab4be..975c501f83aeb06415644368b629a74890b3a5c0 100644 (file)
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -5,7 +5,7 @@
 
 name       = mc
 version    = 4.7.4
-release    = 1
+release    = 2
 
 groups     = Applications/System
 url        = http://www.ibiblio.org/mc/
@@ -32,9 +32,6 @@ build
                slang-devel
        end
 
-       # This awkward dependency is found and cannot be resolved.
-       PKG_REQUIRES_FILTER = perl\(pieces\)
-
        configure_options += \
                --sysconfdir=/etc \
                --libexecdir=/usr/lib \
@@ -51,4 +48,9 @@ end
 
 packages
        package %{name}
+               # This awkward dependency is found and cannot be resolved.
+               filter_requires
+                       perl\(pieces\)
+               end
+       end
 end
index 063f472b26fa8d93498171502fb793a774c2bc28..81d989ac75f15349443a355a2fd24d183a10c51e 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = ncurses
 version    = 5.9
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = http://invisible-island.net/ncurses/ncurses.html
@@ -72,6 +72,8 @@ packages
                        the ncurses-base package.
                end
 
+               provides += /usr/share/terminfo
+
                files
                        /usr/share/terminfo
                end
@@ -84,6 +86,8 @@ packages
                        descriptions are included in the ncurses-term package.
                end
 
+               conflicts = ncurses<=5.9-1
+
                files
                        /usr/share/terminfo/*/Eterm*
                        /usr/share/terminfo/*/aterm
index 18771d3cc73de65cbb18e57182f9f9ee555d5b93..351662a08a206d557523a168a59bfa882cea5c36 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = net-snmp
-version    = 5.7
-release    = 1
+version    = 5.7.1
+release    = 2
 
 groups     = Networking/Daemons
 url        = http://net-snmp.sourceforge.net
@@ -18,7 +18,7 @@ description
        computer equipment and even devices like UPSs.
 end
 
-source_dl  =
+source_dl  = https://sourceforge.net/projects/net-snmp/files/net-snmp/%{version}/
 
 build
        requires
@@ -48,6 +48,12 @@ end
 
 packages
        package %{name}
+               # XXX Although we don't want to build perl modules,
+               # we have this requirement?!
+               filter_requires
+                       perl\(NetSNMP::TrapReceiver\)
+               end
+       end
 
        package %{name}-libs
                template LIBS
index 6ae463158577f00d59d17362ed773fb3540e6210..b34378c046c87e72cddd0251f4500864bf2b5f10 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = nettle
-version    = 2.2
+version    = 2.4
 release    = 1
 
 groups     = System/Libraries
@@ -19,7 +19,7 @@ description
        or even in kernel space.
 end
 
-source_dl  =
+source_dl  = http://www.lysator.liu.se/~nisse/archive/
 
 build
        requires
@@ -40,8 +40,8 @@ packages
        package %{name}
 
        package %{name}-devel
-               requires
-                       gmp-devel
-               end
+               template DEVEL
+
+               requires += gmp-devel
        end
 end
index 0207ff4808b3d2310af3b6d9808793201c70a0b9..3665a187e8110c796bec24d7e980e830f719ad25 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = network
 epoch      = 1
-version    = 001
+version    = 002
 release    = 1
 arch       = noarch
 
@@ -25,7 +25,7 @@ description
        everything.
 end
 
-source_dl  =
+source_dl  = http://source.ipfire.org/releases/network/
 
 build
        build = # Do nothing
@@ -52,5 +52,25 @@ packages
                        /bin/ipcalc
                        /usr/bin/logger
                end
+
+               prerequires = systemd-units
+
+               # Enable network service, so it starts at the first boot.
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl --no-reload enable network.service >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable network.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop network.service >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
+                       # Maybe it is not a good idea to restart network.
+                       #/bin/systemctl try-reload-or-restart network.service >/dev/null 2>&1 || :
+               end
        end
 end
index 8688ed3fecf2f2ea0987cf7f06f3021b4e195144..5632b2f6f9299b405d589b910f0bce76638bbc4f 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = newt
-version    = 0.52.10
+version    = 0.52.13
 release    = 1
 
 groups     = System/Libraries
@@ -22,7 +22,7 @@ description
        slang library.
 end
 
-source_dl  =
+source_dl  = %{url}
 
 build
        requires
@@ -61,4 +61,8 @@ packages
                        /usr/lib/python*/site-packages/*snack*
                end
        end
+
+       package %{name}-devel
+               template DEVEL
+       end
 end
index 278f3e13f6651c248e807da586db4ac64b8c5565..cffef400e53a062675412c76f1c09f7ea0959405 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 1.0.0e
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -26,6 +26,7 @@ build
                bc
                gnutls-devel
                perl
+               util-linux
                zlib-devel
        end
 
@@ -96,6 +97,22 @@ build
                mkdir -pv %{BUILDROOT}/etc/pki/tls
                install -m 0644 %{DIR_SOURCE}/openssl.cnf %{BUILDROOT}/etc/pki/tls
                cp -v -r certs %{BUILDROOT}/etc/pki/tls
+
+               # Rename man pages so that they don't conflict with other system man pages.
+               pushd ${BUILDROOT}/usr/share/man
+               for manpage in man*/*; do
+                       if [ -L ${manpage} ]; then
+                               TARGET=`ls -l ${manpage} | awk '{ print $NF }'`
+                               ln -snf ${TARGET}ssl ${manpage}ssl
+                               rm -f ${manpage}
+                       else
+                               mv ${manpage} ${manpage}ssl
+                       fi
+               done
+
+               mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}passwd.1
+               mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}rand.1
+               popd
        end
 end
 
index a96e3e0ce797d2404b673c45a825c0a5763a9a1e..2de185063469bb12c6d31d6c5b0de492fe151ec0 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.10
-release    = 1
+version    = 0.9.16
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Packaging
@@ -22,6 +22,8 @@ source_dl  = http://source.ipfire.org/releases/pakfire/
 
 build
        requires
+               gettext
+               libcap-devel
                libsolv-devel
                python-devel
        end
@@ -46,7 +48,6 @@ packages
                        pyliblzma
                        python-progressbar
                        python-urlgrabber
-                       pyxattr
                        system-release
                end
 
@@ -57,7 +58,7 @@ packages
                end
        end
        
-       package %{name}-build
+       package %{name}-builder
                summary = The pakfire builder.
                description
                        The tools that are needed to build new pakfire packages.
@@ -68,6 +69,8 @@ packages
                        %{name}=%{thisver}
                        quality-agent=%{thisver}
                end
+               provides = pakfire-build=%{thisver}
+               obsoletes = pakfire-build<%{thisver}
                conflicts = build-essentials
 
                files
index 925b7177f21f82106836be9df304be3fcfb4f311..f99c40d96a37c9076f99787d4c01949fb22934bd 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = paxtest
 version    = 0.9.9
-release    = 2
+release    = 3
 
 groups     = Security/Tools
 url        = http://pax.grsecurity.org/
@@ -31,7 +31,6 @@ build
                        RUNDIR=/usr/lib/paxtest BINDIR=/usr/bin
        end
 
-       export PKG_REQUIRES_FILTER = shlibtest
 end
 
 quality-agent
@@ -42,4 +41,8 @@ end
 
 packages
        package %{name}
+               filter_requires
+                       shlibtest
+               end
+       end
 end
diff --git a/perl-Test-Simple/perl-Test-Simple.nm b/perl-Test-Simple/perl-Test-Simple.nm
deleted file mode 100644 (file)
index d70a35b..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = Test-Simple
-version    = 0.98
-release    = 1
-arch       = noarch
-
-groups     = Development/Libratries
-url        = http://search.cpan.org/dist/Test-Simple/
-license    = GPL+ or Artistic
-summary    = Basic utilities for writing tests.
-
-description
-       This package provides the bulk of the core testing facilities.  For more
-       information, see perldoc for Test::Simple, Test::More, etc.
-end
-
-source_dl  =
-
-build
-       requires
-               perl-core
-               perl-devel
-               perl(Test::Harness)
-       end
-
-       build
-               perl Makefile.PL INSTALLDIRS=perl
-               make %{PARALLELISMFLAGS}
-       end
-
-       test
-               make test
-       end
-end
-
-packages
-       package perl-%{name}
-end
index f7e58430278ad7e4aa086e66b6a88c1df04896b1..4538da5a99f134c298f589855f843b14986cc3b2 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = perl-libwww-perl
 version    = 5.837
-release    = 1
+release    = 2
 epoch      = 1
 arch       = noarch
 thisapp    = libwww-perl-%{version}
@@ -28,31 +28,37 @@ build
                perl-core
                perl-devel
                perl-HTML-Parser
-               perl-libwww-perl
                perl(Test::More)
                perl(Compress::Zlib)
                perl(MIME::Base64)
                perl(Net::FTP)
+               perl(URI)
        end
 
-       # Filter string for very weird dependencies.
-       export PKG_REQUIRES_FILTER = (HTTP::Headers|HTTP::GHTTP|Win32|Authen::NTLM)
-
        build
                perl Makefile.PL INSTALLDIRS=perl --aliases < /dev/null
                make %{PARALLELISMFLAGS}
        end
 
-       test
-               # Use system wide MIME types (link also to blib/... for "make test").  Doing
-               # this stuff before "make install" would not cause the symlink to be packaged
-               # but a copy of /etc/mime.types.
-               ln -svf /etc/mime.types %{DIR_APP}/blib/lib/LWP/media.types
-
-               make test
-       end
+       #test
+       #       # Use system wide MIME types (link also to blib/... for "make test").  Doing
+       #       # this stuff before "make install" would not cause the symlink to be packaged
+       #       # but a copy of /etc/mime.types.
+       #       ln -svf /etc/mime.types %{DIR_APP}/blib/lib/LWP/media.types
+       #
+       #       make test
+       #end
 end
 
 packages
        package %{name}
+               # Filter string for very weird dependencies.
+               filter_requires
+                       HTTP::Headers
+                       HTTP::GHTTP
+                       Win32
+                       Authen::NTLM
+               end
+       end
+
 end
index 5389fcd8f340f2d5828a53d52b8318c2b44b0d21..19ff646efdee4e6192f44ced30898f01fa40fade 100644 (file)
@@ -4,9 +4,11 @@
 ###############################################################################
 
 name       = perl
-version    = 5.12.3
-release    = 4
+version    = 5.14.2
+# Never reset release in this package, just increase.
+release    = 9
 
+maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Languages
 url        = http://www.perl.org/
 license    = GPL+ or Artistic and GPLv2+ or Artistic
@@ -24,7 +26,7 @@ description
        scripts.
 end
 
-source_dl  =
+source_dl  = http://www.cpan.org/src/5.0/
 
 build
        requires
@@ -41,9 +43,6 @@ build
        # So we need to pass it explicitely.
        CFLAGS += -fstack-protector-all
 
-       # Filter string for very weird dependencies.
-       export PKG_REQUIRES_FILTER = (DBD\:\:SQLite|DBIx\:\:Simple|perl>=[0-9]\:.*|NDBM_File|Your\:\:Module\:\:Here|FCGI|Mac\:\:.*)
-
        prepare_cmds
                sed -i 's/command /command[ -]/' makedepend.SH
        end
@@ -56,7 +55,6 @@ build
 
                sh ./Configure -des \
                        -Doptimize="%{CFLAGS}" \
-                       -Dccdlflags="-Wl,--enable-new-dtags" \
                        -Dversion=%{version} \
                        -Dmyhostname=localhost \
                        -Dperladmin=root@localhost \
@@ -102,9 +100,9 @@ build
                make %{PARALLELISMFLAGS}
        end
 
-#      test
-#              make test
-#      end
+       #test
+       #       make test
+       #end
 
        install_cmds
                # Remove precreated directories
@@ -120,81 +118,101 @@ quality-agent
        end
 end
 
+# This variable contains the constant version string
+# of this perl package.
+perl_requires := %{name}=%{thisver}
+
+perl_filter_requires
+       perl>=[0-9]\:.*
+end
+
 packages
-       package %{name}
+       package perl
                requires
-                       %{name}-libs=%{thisver}
+                       perl-libs=%{thisver}
+                       perl(Carp)
                end
 
                provides
-                       # These provides are needed by the perl pkg itself with auto-generated perl.req
-                       %{name}(VMS::Filespec)
-                       %{name}(VMS::Stdio)
-       
                        # Compat provides
-                       %{name}(:MODULE_COMPAT_5.12.3)
-                       %{name}(:MODULE_COMPAT_5.12.2)
-                       %{name}(:MODULE_COMPAT_5.12.1)
-                       %{name}(:MODULE_COMPAT_5.12.0)
+                       perl(:MODULE_COMPAT_5.14.2)
+                       perl(:MODULE_COMPAT_5.14.1)
+                       perl(:MODULE_COMPAT_5.14.0)
        
                        # Threading provides
-                       %{name}(:WITH_ITHREADS)
-                       %{name}(:WITH_THREADS)
+                       perl(:WITH_ITHREADS)
+                       perl(:WITH_THREADS)
        
                        # Largefile provides
-                       %{name}(:WITH_LARGEFILES)
+                       perl(:WITH_LARGEFILES)
 
                        # PerlIO provides
-                       %{name}(:WITH_PERLIO)
+                       perl(:WITH_PERLIO)
        
                        # File provides
-                       %{name}(abbrev.pl)
-                       %{name}(assert.pl)
-                       %{name}(bigfloat.pl)
-                       %{name}(bigint.pl)
-                       %{name}(bigrat.pl)
-                       %{name}(bytes_heavy.pl)
-                       %{name}(cacheout.pl)
-                       %{name}(complete.pl)
-                       %{name}(ctime.pl)
-                       %{name}(dotsh.pl)
-                       %{name}(dumpvar.pl)
-                       %{name}(exceptions.pl)
-                       %{name}(fastcwd.pl)
-                       %{name}(find.pl)
-                       %{name}(finddepth.pl)
-                       %{name}(flush.pl)
-                       %{name}(ftp.pl)
-                       %{name}(getcwd.pl)
-                       %{name}(getopt.pl)
-                       %{name}(getopts.pl)
-                       %{name}(hostname.pl)
-                       %{name}(importenv.pl)
-                       %{name}look.pl)
-                       %{name}(newgetopt.pl)
-                       %{name}(open2.pl)
-                       %{name}(open3.pl)
-                       %{name}(perl5db.pl)
-                       %{name}(pwd.pl)
-                       %{name}(shellwords.pl)
-                       %{name}(stat.pl)
-                       %{name}(syslog.pl)
-                       %{name}(tainted.pl)
-                       %{name}(termcap.pl)
-                       %{name}(timelocal.pl)
-                       %{name}(utf8_heavy.pl)
-                       %{name}(validate.pl)
-                       %{name}(Carp)
-                       %{name}(Carp::Heavy)
-                       %{name}(Exporter)
-                       %{name}(File::Basename)
-                       %{name}(constant)
-                       %{name}(strict)
-                       %{name}(vars)
+                       perl(abbrev.pl)
+                       perl(assert.pl)
+                       perl(bigfloat.pl)
+                       perl(bigint.pl)
+                       perl(bigrat.pl)
+                       perl(bytes_heavy.pl)
+                       perl(cacheout.pl)
+                       perl(complete.pl)
+                       perl(ctime.pl)
+                       perl(dotsh.pl)
+                       perl(dumpvar.pl)
+                       perl(exceptions.pl)
+                       perl(fastcwd.pl)
+                       perl(find.pl)
+                       perl(finddepth.pl)
+                       perl(flush.pl)
+                       perl(ftp.pl)
+                       perl(getcwd.pl)
+                       perl(getopt.pl)
+                       perl(getopts.pl)
+                       perl(hostname.pl)
+                       perl(importenv.pl)
+                       perllook.pl)
+                       perl(newgetopt.pl)
+                       perl(open2.pl)
+                       perl(open3.pl)
+                       perl(perl5db.pl)
+                       perl(pwd.pl)
+                       perl(shellwords.pl)
+                       perl(stat.pl)
+                       perl(syslog.pl)
+                       perl(tainted.pl)
+                       perl(termcap.pl)
+                       perl(timelocal.pl)
+                       perl(utf8_heavy.pl)
+                       perl(validate.pl)
+                       perl(Exporter)
+                       perl(File::Basename)
+                       perl(constant)
+                       perl(strict)
+                       perl(vars)
+
+                       # XXX why?
+                       perl(Mac::InternetConfig)
+                       perl(NDBM_File)
+               end
+
+               filter_requires
+                       %{perl_filter_requires}
+                       DBIx
+                       InternetConfig
+                       perl\(Mac
+                       perl\(NDBM_File
+                       perl\(VMS
+               end
+
+               filter_provides
+                       Carp
+                       perl\(Carp\)
                end
        end
        
-       package %{name}-libs
+       package perl-libs
                template LIBS
        
                provides
@@ -206,7 +224,7 @@ packages
                end
        end
        
-       package %{name}-devel
+       package perl-devel
                template DEVEL
        
                files
@@ -226,7 +244,7 @@ packages
                end
        end
        
-       #package %{name}-tests
+       #package perl-tests
        #       summary = Testsuite to check your Perl installation.
        #       description-perl-tests
        #               This package contains the test suite included with perl %{thisver}.
@@ -239,9 +257,9 @@ packages
        #       end
        #end
        
-       package %{name}-Archive-Extract
+       package perl-Archive-Extract
                epoch = 0
-               version = 0.38
+               version = 0.48
                arch = noarch
        
                summary = Generic archive extracting mechanism.
@@ -250,7 +268,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -259,9 +277,9 @@ packages
                end
        end
        
-       package %{name}-Archive-Tar
+       package perl-Archive-Tar
                epoch = 0
-               version = 1.54
+               version = 1.76
                arch = noarch
        
                summary = A module for Perl manipulation of .tar files.
@@ -274,22 +292,48 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
                        /usr/bin/ptar
                        /usr/bin/ptardiff
+                       /usr/bin/ptargrep
                        /usr/share/perl5/Archive/Tar.pm
                        /usr/share/man/man1/ptar.1*
                        /usr/share/man/man1/ptardiff.1*
+                       /usr/share/man/man1/ptargrep.1*
                        /usr/share/man/man3/Archive::Tar*
                end
        end
+
+       package perl-Class-ISA
+               epoch = 0
+               version = 0.36
+               arch = noarch
+
+               summary = Report the search path for a class's ISA tree
+               description
+                       Suppose you have a class (like Food::Fish::Fishstick) that is derived, via
+                       its @ISA, from one or more superclasses (as Food::Fish::Fishstick is from
+                       Food::Fish, Life::Fungus, and Chemicals), and some of those superclasses
+                       may themselves each be derived, via its @ISA, from one or more superclasses
+                       (as above).
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               files
+                       /usr/share/perl5/Class/ISA.pm
+                       /usr/share/man/man3/Class::ISA.3*
+               end
+       end
        
-       package %{name}-Compress-Raw-Zlib
+       package perl-Compress-Raw-Zlib
                epoch = 0
-               version = 2.024
+               version = 2.033
 
                summary = Low-Level Interface to the zlib compression library.
                description
@@ -298,7 +342,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -306,10 +350,47 @@ packages
                        /usr/share/man/man3/Compress::Raw::Zlib*
                end
        end
+
+       package perl-CGI
+               epoch = 0
+               version = 3.49
+               arch = noarch
+
+               summary = Handle Common Gateway Interface requests and responses
+               description
+                       CGI.pm is a stable, complete and mature solution for processing and preparing
+                       HTTP requests and responses. Major features including processing form
+                       submissions, file uploads, reading and writing cookies, query string generation
+                       and manipulation, and processing and preparing HTTP headers. Some HTML
+                       generation utilities are included as well.
+
+                       CGI.pm performs very well in in a vanilla CGI.pm environment and also comes
+                       with built-in support for mod_perl and mod_perl2 as well as FastCGI.
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               provides
+                       perl(CGI)=%{version}
+               end
+
+               filter_requires
+                       perl\(FCGI\)
+               end
+
+               files
+                       /usr/share/perl5/CGI
+                       /usr/share/perl5/CGI.pm
+                       /usr/share/man/man3/CGI.3*
+                       /usr/share/man/man3/CGI::*.3*
+               end
+       end
        
-       package %{name}-CPAN
+       package perl-CPAN
                epoch = 0
-               version = 1.9402
+               version = 1.9600.01
                arch = noarch
        
                summary = Query, download and build perl modules from CPAN sites.
@@ -318,7 +399,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                        perl(Digest::SHA)
                end
        
@@ -326,6 +407,10 @@ packages
                        cpan
                        cpan=$(version-perl-CPAN)
                end
+
+               filter_requires
+                       perl\(Mac::BuildTools\)
+               end
        
                files
                        /usr/bin/cpan
@@ -335,9 +420,62 @@ packages
                end
        end
 
-       package %{name}-CPANPLUS
+       package perl-CPAN-Meta
+               epoch = 0
+               version = 2.110440
+               arch = noarch
+
+               summary = Distribution metadata for a CPAN dist.
+               description
+                       Software distributions released to the CPAN include a META.json or, for
+                       older distributions, META.yml, which describes the distribution, its
+                       contents, and the requirements for building and installing the
+                       distribution. The data structure stored in the META.json file is described
+                       in CPAN::Meta::Spec.
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               files
+                       /usr/share/perl5/CPAN/Meta.pm
+                       /usr/share/perl5/CPAN/Meta
+                       /usr/share/perl5/CPAN/Meta/Converter.pm
+                       /usr/share/perl5/CPAN/Meta/Feature.pm
+                       /usr/share/perl5/CPAN/Meta/History.pm
+                       /usr/share/perl5/CPAN/Meta/Prereqs.pm
+                       /usr/share/perl5/CPAN/Meta/Spec.pm
+                       /usr/share/perl5/CPAN/Meta/Validator.pm
+                       /usr/share/man/man5/CPAN::Meta.*
+               end
+       end
+
+       package perl-CPAN-Meta-YAML
+               epoch = 0
+               version = 0.0003
+               arch = noarch
+
+               summary = Read and write a subset of YAML for CPAN Meta files.
+               description
+                       This module implements a subset of the YAML specification for use in reading
+                       and writing CPAN metadata files like META.yml and MYMETA.yml. It should not be
+                       used for any other general YAML parsing or generation task.
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               files
+                       /usr/share/perl5/CPAN/Meta/YAML.pm
+                       /usr/share/man/man5/CPAN::Meta::YAML*
+               end
+       end
+
+       package perl-CPANPLUS
                epoch = 0
-               version = 0.9
+               version = 0.9103
                arch = noarch
        
                summary = API & CLI access to the CPAN mirrors.
@@ -347,15 +485,21 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
-                       %{name}(Digest::SHA)
-                       %{name}(Module::Pluggable)>=2.4
-                       %{name}(Module::CoreList)
-                       %{name}(DBIx::Simple)
+                       %{perl_requires}
+                       perl(Digest::SHA)
+                       perl(Module::Pluggable)>=2.4
+                       perl(Module::CoreList)
                end
        
                provides
-                       %{name}-CPANPLUS-Dist-Build=0.06
+                       perl-CPANPLUS-Dist-Build=0.06
+               end
+
+               filter_requires
+                       %{perl_filter_requires}
+                       DBIx
+                       Your::Module::Here
+                       perl\(DBD::SQLite\)
                end
        
                files
@@ -368,10 +512,94 @@ packages
                        /usr/share/man/man3/CPANPLUS*
                end
        end
+
+       package perl-Carp
+               epoch = 0
+               version = 1.20
+               arch = noarch
+
+               summary = Alternative warn and die for modules.
+               description
+                       The Carp routines are useful in your own modules because they act like
+                       die() or warn(), but with a message which is more likely to be useful to a
+                       user of your module. In the case of cluck, confess, and longmess that
+                       context is a summary of every call in the call-stack. For a shorter message
+                       you can use carp or croak which report the error as being from where your
+                       module was called. There is no guarantee that that is where the error was,
+                       but it is a good educated guess.
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               # Do not export unversioned module
+               filter_provides = ^perl\(Carp\)\s*$
+
+               files
+                       /usr/share/perl5/Carp*
+                       /usr/share/man3/Carp*
+               end
+       end
+
+       package perl-Digest
+               epoch = 0
+               version = 1.16
+               arch = noarch
+
+               summary = Modules that calculate message digests.
+               description
+                       The Digest:: modules calculate digests, also called "fingerprints" or
+                       "hashes", of some data, called a message. The digest is (usually)
+                       some small/fixed size string. The actual size of the digest depend of
+                       the algorithm used. The message is simply a sequence of arbitrary
+                       bytes or bits.
+               end
+
+               requires
+                       %{perl_requires}
+                       perl(MIME::Base64)
+               end
+
+               files
+                       /usr/lib/perl5/Digest
+                       !/usr/lib/perl5/Digest/*
+                       /usr/share/perl5/Digest.pm
+                       /usr/share/perl5/Digest/base.pm
+                       /usr/share/perl5/Digest/file.pm
+                       /usr/share/man/man5/Digest.3*
+                       /usr/share/man/man5/Digest::base.3*
+                       /usr/share/man/man5/Digest::file.3*
+               end
+       end
+
+       package perl-Digest-MD5
+               epoch = 0
+               version = 2.51
+
+               summary = Perl Interface to the MD5 Algorithm.
+               description
+                       The Digest::MD5 module allows you to use the RSA Data Security Inc. MD5
+                       Message Digest algorithm from within Perl programs. The algorithm takes as
+                       input a message of arbitrary length and produces as output a 128-bit
+                       "fingerprint" or "message digest" of the input.
+               end
+
+               requires
+                       %{perl_requires}
+                       perl(Digest::base)>=1.00
+               end
+
+               files
+                       /usr/lib/perl5/Digest/MD5.pm
+                       /usr/lib/perl5/auto/Digest/MD5
+                       /usr/share/man/man3/Digest::MD5.3*
+               end
+       end
        
-       package %{name}-Digest-SHA
+       package perl-Digest-SHA
                epoch = 0
-               version = 5.47
+               version = 5.61
        
                summary = Perl extension for SHA-1/224/256/384/512.
                description
@@ -382,20 +610,22 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
+                       perl(Digest::base)
+                       perl(MIME::Base64)
                end
        
                files
                        /usr/bin/shasum
-                       /usr/share/perl5/Digest*
+                       /usr/share/perl5/Digest/SHA*
                        /usr/share/man/man1/shasum.1*
                        /usr/share/man/man3/Digest::SHA.3*
                end
        end
-       
-       package %{name}-ExtUtils-CBuilder
+
+       package perl-ExtUtils-CBuilder
                epoch = 0
-               version = 0.27
+               version = 0.280203
                arch = noarch
 
                summary = Compile and link C code for Perl modules.
@@ -405,53 +635,53 @@ packages
                        motivated by the Module::Build project, but may be useful for other
                        purposes as well.
                end
-       
+
                requires
-                       %{name}=%{thisver}
-                       %{name}-devel
+                       %{perl_requires}
+                       perl-devel
                end
-       
+
                files
                        /usr/share/perl5/ExtUtils/CBuilder*
                        /usr/share/man/man3/ExtUtils::CBuilder*
                end
        end
-       
-       package %{name}-ExtUtils-Embed
+
+       package perl-ExtUtils-Embed
                epoch = 0
-               version = 1.28
+               version = 1.30
                arch = noarch
-       
+
                summary = Utilities for embedding Perl in C/C++ applications.
                description
                        Utilities for embedding Perl in C/C++ applications.
                end
-       
+
                requires
-                       %{name}=%{thisver}
-                       %{name}-devel
+                       %{perl_requires}
+                       perl-devel
                end
-       
+
                files
                        /usr/share/perl5/ExtUtils/Embed*
                        /usr/share/man/man3/ExtUtils::Embed*
                end
        end
-       
-       package %{name}-ExtUtils-MakeMaker
+
+       package perl-ExtUtils-MakeMaker
                epoch = 0
-               version = 6.56
+               version = 6.57_05
                arch = noarch
-       
+
                summary = Create a module Makefile.
                description
                        Create a module Makefile.
                end
-       
+
                requires
-                       %{name}=%{thisver}
-                       %{name}-devel
-                       %{name}(Test::Harness)
+                       %{perl_requires}
+                       perl-devel
+                       perl(Test::Harness)
                end
 
                files
@@ -486,10 +716,10 @@ packages
                        /usr/share/man/man3/ExtUtils::testlib.3*
                end
        end
-       
-       package %{name}-ExtUtils-ParseXS
+
+       package perl-ExtUtils-ParseXS
                epoch = 0
-               version = 2.21
+               version = 2.2210
                arch = noarch
 
                summary = Module and a script for converting Perl XS code into C code.
@@ -498,61 +728,87 @@ packages
                        constructs necessary to let C functions manipulate Perl values and creates
                        the glue necessary to let Perl access those functions.
                end
-       
+
                requires
-                       %{name}=%{thisver}
-                       %{name}-devel
+                       %{perl_requires}
+                       perl-devel
                end
-       
+
                files
                        /usr/share/perl5/ExtUtils/ParseXS.pm
                        /usr/share/perl5/ExtUtils/xsubpp
                        /usr/share/man/man3/ExtUtils::ParseXS.3*
                end
        end
-       
-       package %{name}-File-Fetch
-               epoch = 0
-               version = 6.56
+
+       package perl-File-Fetch
+               epoch = 1
+               version = 0.32
                arch = noarch
 
                summary = Generic file fetching mechanism.
                description
                        File::Fetch is a generic file fetching mechanism.
                end
-       
+
                requires
-                       %{name}=%{thisver}
-                       %{name}(IPC::Cmd)>=0.36
-                       %{name}(Module::Load::Conditional)>=0.04
-                       %{name}(Params::Check)>=0.07
+                       %{perl_requires}
+                       perl(IPC::Cmd)>=0.36
+                       perl(Module::Load::Conditional)>=0.04
+                       perl(Params::Check)>=0.07
                end
-       
+
                files
                        /usr/share/perl5/File/Fetch.pm
                        /usr/share/man/man3/File::Fetch.3*
                end
        end
-       
-       package %{name}-IO-Compress
+
+       package perl-HTTP-Tiny
                epoch = 0
-               version = 2.026
-       
+               version = 0.012
+               arch = noarch
+
+               summary = A small, simple, correct HTTP/1.1 client.
+               description
+                       This is a very simple HTTP/1.1 client, designed primarily for doing simple GET
+                       requests without the overhead of a large framework like LWP::UserAgent.
+                       It is more correct and more complete than HTTP::Lite. It supports proxies
+                       (currently only non-authenticating ones) and redirection. It also correctly
+                       resumes after EINTR.
+               end
+
+               requires
+                       %{perl_requires}
+                       perl(Carp)
+                       perl(IO::Socket)
+               end
+
+               files
+                       /usr/share/perl5/HTTP/Tiny.pm
+                       /usr/share/man/man5/HTTP::Tiny*
+               end
+       end
+
+       package perl-IO-Compress
+               epoch = 0
+               version = 2.033
+
                summary = IO::Compress wrapper for modules.
                description
                        This module is the base class for all IO::Compress and IO::Uncompress
                        modules. This module is not intended for direct use in application code.
                        Its sole purpose is to to be sub-classed by IO::Compress modules.
                end
-       
+
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
-       
+
                provides
-                       %{name}(IO::Uncompress::Bunzip2)
+                       perl(IO::Uncompress::Bunzip2)
                end
-       
+
                files
                        /usr/share/perl5/Compress/Zlib.pm
                        /usr/lib/perl5/auto/Compress/Zlib/
@@ -568,8 +824,8 @@ packages
                        /usr/share/man/man3/IO::Uncompress::Base.*
                end
        end
-       
-       package %{name}-IO-Zlib
+
+       package perl-IO-Zlib
                epoch = 0
                version = 1.10
                arch = noarch
@@ -581,40 +837,67 @@ packages
                        the same way as an IO::File object so you can have common code that doesn't
                        know which sort of file it is using.
                end
-       
+
                requires
-                       %{name}=%{thisver}
-                       %{name}(Compress::Zlib)
+                       %{perl_requires}
+                       perl(Compress::Zlib)
                end
-       
+
                files
                        /usr/share/perl5/IO/Zlib.pm
                        /usr/share/man/man3/IO::Zlib.*
                end
        end
-       
-       package %{name}-IPC-Cmd
+
+       package perl-IPC-Cmd
                epoch = 0
-               version = 0.54
+               version = 0.70
                arch = noarch
-       
+
                summary = Finding and running system commands made easy.
                description
                        IPC::Cmd allows you to run commands, interactively if desired, in a
                        platform independent way, but have them still work.
                end
-       
+
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
+                       perl(ExtUtils::MakeMaker)
                end
-       
+
                files
                        /usr/share/perl5/IPC/Cmd.pm
                        /usr/share/man/man3/IPC::Cmd.3*
                end
        end
+
+       package perl-JSON-PP
+               epoch = 0
+               version = 2.27150
+               arch = noarch
+
+               summary = JSON::XS compatible pure-Perl module.
+               description
+                       JSON::XS is the fastest and most proper JSON module on CPAN. It is written by
+                       Marc Lehmann in C, so must be compiled and installed in the used environment.
+                       JSON::PP is a pure-Perl module and is compatible with JSON::XS.
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               files
+                       /usr/bin/json_pp
+                       /usr/share/perl5/JSON/PP
+                       /usr/share/perl5/JSON/PP.pm
+                       /usr/share/man/man1/json_pp.1*
+                       /usr/share/man/man3/JSON::PP.3*
+                       /usr/share/man/man3/JSON::PP::Boolean.3pm*
+               end
+       end
        
-       package %{name}-Locale-Maketext-Simple
+       package perl-Locale-Maketext-Simple
                epoch = 0
                version = 0.21
                arch = noarch
@@ -627,7 +910,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -636,9 +919,9 @@ packages
                end
        end
        
-       package %{name}-Log-Message
+       package perl-Log-Message
                epoch = 0
-               version = 0.02
+               version = 0.04
                arch = noarch
        
                summary = Generic message storage mechanism.
@@ -652,11 +935,11 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                provides
-                       %{name}(Log::Message::Handlers)=%{version}
+                       perl(Log::Message::Handlers)=%{version}
                end
 
                files
@@ -671,9 +954,9 @@ packages
                end
        end
        
-       package %{name}-Log-Message-Simple
+       package perl-Log-Message-Simple
                epoch = 0
-               version = 0.06
+               version = 0.08
                arch = noarch
        
                summary = Simplified frontend to Log::Message.
@@ -683,7 +966,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -692,9 +975,9 @@ packages
                end
        end
        
-       package %{name}-Module-Build
+       package perl-Module-Build
                epoch = 0
-               version = 0.3603
+               version = 0.3800
                arch = noarch
        
                summary = Perl module for building and installing Perl modules.
@@ -711,10 +994,11 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
-                       %{name}(Archive::Tar)>=1.08
-                       %{name}(ExtUtils::CBuilder)>=0.15
-                       %{name}(ExtUtils::ParseXS)>=1.02
+                       %{perl_requires}
+                       perl(Archive::Tar)>=1.08
+                       perl(CPAN::Meta)>=2.110420
+                       perl(ExtUtils::CBuilder)>=0.15
+                       perl(ExtUtils::ParseXS)>=1.02
                end
        
                files
@@ -727,9 +1011,9 @@ packages
                end
        end
        
-       package %{name}-Module-CoreList
+       package perl-Module-CoreList
                epoch = 0
-               version = 2.29
+               version = 2.49_01
                arch = noarch
        
                summary = Perl core modules indexed by perl versions.
@@ -740,7 +1024,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -751,9 +1035,9 @@ packages
                end
        end
        
-       package %{name}-Module-Load
+       package perl-Module-Load
                epoch = 0
-               version = 0.16
+               version = 0.18
                arch = noarch
        
                summary = Runtime require of both modules and files.
@@ -763,7 +1047,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -772,9 +1056,9 @@ packages
                end
        end
        
-       package %{name}-Module-Load-Conditional
+       package perl-Module-Load-Conditional
                epoch = 0
-               version = 0.34
+               version = 0.44
                arch = noarch
        
                summary = Looking up module information / loading at runtime.
@@ -784,7 +1068,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -793,7 +1077,7 @@ packages
                end
        end
        
-       package %{name}-Module-Loaded
+       package perl-Module-Loaded
                epoch = 0
                version = 0.06
                arch = noarch
@@ -808,7 +1092,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -816,8 +1100,28 @@ packages
                        /usr/share/man/man3/Module::Loaded*
                end
        end
-       
-       package %{name}-Module-Plugable
+
+       package perl-Module-Metadata
+               epoch = 0
+               version = 1.000004
+               arch = noarch
+
+               summary = Gather package and POD information from perl module files.
+               description
+                       Gather package and POD information from perl module files.
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               files
+                       /usr/share/perl5/Module/Metadata.pm
+                       /usr/share/man/man3/Module::Metadata.3pm*
+               end
+       end
+
+       package perl-Module-Plugable
                epoch = 0
                version = 3.90
                arch = noarch
@@ -829,7 +1133,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -841,9 +1145,9 @@ packages
                end
        end
 
-       package %{name}-Object-Accessor
+       package perl-Object-Accessor
                epoch = 0
-               version = 0.36
+               version = 0.38
                arch = noarch
        
                summary = Perl module that allows per object accessors.
@@ -853,7 +1157,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
        
                files
@@ -862,7 +1166,7 @@ packages
                end
        end
        
-       package %{name}-Package-Constants
+       package perl-Package-Constants
                epoch = 0
                version = 0.02
                arch = noarch
@@ -875,7 +1179,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                files
@@ -884,9 +1188,9 @@ packages
                end
        end
        
-       package %{name}-Params-Check
+       package perl-Params-Check
                epoch = 0
-               version = 0.26
+               version = 0.28
                arch = noarch
        
                summary = Generic input parsing/checking mechanism.
@@ -895,11 +1199,11 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                provides
-                       %{name}(Params::Check)
+                       perl(Params::Check)
                end
        
                files
@@ -908,9 +1212,9 @@ packages
                end
        end
        
-       package %{name}-Parse-CPAN-Meta
+       package perl-Parse-CPAN-Meta
                epoch = 0
-               version = 1.40
+               version = 1.4401
                arch = noarch
 
                summary = Parse META.yml and other similar CPAN metadata files.
@@ -920,7 +1224,7 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                files
@@ -929,9 +1233,9 @@ packages
                end
        end
        
-       package %{name}-Path-Tools
+       package perl-Path-Tools
                epoch = 0
-               version = 3.31
+               version = 3.33
                license = (GPL+ or Artistic) and BSD
        
                summary = PathTools Perl module (Cwd, File::Spec).
@@ -940,7 +1244,11 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
+               end
+
+               filter_requires
+                       perl\(VMS\:\:Filespec\)
                end
        
                files
@@ -950,8 +1258,34 @@ packages
                        /usr/share/man/man3/File::Spec*
                end
        end
+
+       package perl-Perl-OSType
+               epoch = 0
+               version = 1.002
+               arch = noarch
+
+               summary = Map perl operating system names to generic types.
+               description
+                       Modules that provide OS-specific behaviors often need to know if the current
+                       operating system matches a more generic type of operating systems. For example,
+                       'linux' is a type of 'Unix' operating system and so is 'freebsd'.
+                       This module provides a mapping between an operating system name as given by $^O
+                       and a more generic type. The initial version is based on the OS type mappings
+                       provided in Module::Build and ExtUtils::CBuilder (thus, Microsoft operating
+                       systems are given the type 'Windows' rather than 'Win32').
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               files
+                       /usr/share/perl5/Perl/OSType.pm
+                       /usr/share/man/man3/Perl::OSType.3pm*
+               end
+       end
        
-       package %{name}-Pod-Escapes
+       package perl-Pod-Escapes
                epoch= 0
                version = 1.04
                arch = noarch
@@ -963,7 +1297,11 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
+               end
+
+               filter_requires
+                       %{perl_filter_requires}
                end
        
                files
@@ -972,9 +1310,9 @@ packages
                end
        end
        
-       package %{name}-Pod-Simple
+       package perl-Pod-Simple
                epoch = 0
-               version = 3.13
+               version = 3.16
                arch = noarch
        
                summary = Framework for parsing POD documentation.
@@ -985,7 +1323,11 @@ packages
                end
        
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
+               end
+
+               filter_requires
+                       %{perl_filter_requires}
                end
        
                files
@@ -995,10 +1337,35 @@ packages
                        /usr/share/man/man3/Pod::Simple*
                end
        end
+
+       package perl-Scalar-List-Utils
+               epoch = 0
+               version = 1.22
+
+               summary = A selection of general-utility scalar and list subroutines.
+               description
+                       Scalar::Util and List::Util contain a selection of subroutines that people have
+                       expressed would be nice to have in the perl core, but the usage would not
+                       really be high enough to warrant the use of a keyword, and the size so small
+                       such that being individual extensions would be wasteful.
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               files
+                       /usr/lib/perl5/List
+                       /usr/lib/perl5/Scalar
+                       /usr/lib/perl5/auto/List
+                       /usr/share/man/man3/List::Util*
+                       /usr/share/man/man3/Scalar::Util*
+               end
+       end
        
-       package %{name}-Term-UI
+       package perl-Term-UI
                epoch = 0
-               version = 0.20
+               version = 0.26
                arch = noarch
 
                summary = Term::ReadLine UI made easy.
@@ -1009,8 +1376,8 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
-                       %{name}(Log::Message::Simple)
+                       %{perl_requires}
+                       perl(Log::Message::Simple)
                end
 
                files
@@ -1020,9 +1387,9 @@ packages
                end
        end
 
-       package %{name}-Test-Harness
+       package perl-Test-Harness
                epoch = 0
-               version = 3.17
+               version = 3.23
                arch = noarch
 
                summary = Run Perl standard test scripts with statistics.
@@ -1032,7 +1399,11 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
+               end
+
+               filter_requires
+                       %{perl_filter_requires}
                end
 
                files
@@ -1047,9 +1418,9 @@ packages
                end
        end
 
-       package %{name}-Test-Simple
+       package perl-Test-Simple
                epoch = 0
-               version = 0.94
+               version = 0.98
                arch = noarch
 
                summary = Basic utilities for writing tests.
@@ -1058,7 +1429,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                files
@@ -1073,9 +1444,9 @@ packages
                end
        end
 
-       package %{name}-Time-Piece
+       package perl-Time-Piece
                epoch = 0
-               version = 1.15
+               version = 1.20_01
 
                summary = Time objects from localtime and gmtime.
                description
@@ -1086,7 +1457,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                files
@@ -1098,9 +1469,31 @@ packages
                end
        end
 
-       package %{name}-parent
+       package perl-Version-Requirements
+               epoch = 0
+               version = 0.101020
+               arch = noarch
+
+               summary = Set of version requirements for a CPAN dist.
+               description
+                       A Version::Requirements object models a set of version constraints like
+                       those specified in the META.yml or META.json files in CPAN distributions.
+                       It can be built up by adding more and more constraints, and it will reduce
+                       them to the simplest representation.
+               end
+
+               requires
+                       %{perl_requires}
+               end
+
+               # No files.
+               files
+               end
+       end
+
+       package perl-parent
                epoch = 0
-               version = 0.223
+               version = 0.225
                arch = noarch
 
                summary = Establish an ISA relationship with base classes at compile time.
@@ -1110,7 +1503,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                files
@@ -1119,9 +1512,9 @@ packages
                end
        end
 
-       package %{name}-threads
+       package perl-threads
                epoch = 0
-               version = 1.75
+               version = 1.83
 
                summary = Perl interpreter-based threads.
                description
@@ -1135,7 +1528,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                files
@@ -1145,9 +1538,9 @@ packages
                end
        end
 
-       package %{name}-threads-shared
+       package perl-threads-shared
                epoch = 0
-               version = 1.32
+               version = 1.37
 
                summary = Perl extension for sharing data structures between threads.
                description
@@ -1160,7 +1553,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                files
@@ -1170,9 +1563,9 @@ packages
                end
        end
 
-       package %{name}-version
+       package perl-version
                epoch = 0
-               version = 0.82
+               version = 0.88
                arch = noarch
 
                summary = Perl extension for Version Objects.
@@ -1181,7 +1574,7 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
+                       %{perl_requires}
                end
 
                files
@@ -1193,7 +1586,7 @@ packages
                end
        end
 
-       package %{name}-core
+       package perl-core
                epoch = 0
 
                summary = Base perl metapackage.
@@ -1203,46 +1596,58 @@ packages
                end
 
                requires
-                       %{name}=%{thisver}
-                       %{name}-libs
-                       %{name}-devel
-                       %{name}-Archive-Extract
-                       %{name}-Archive-Tar
-                       %{name}-Compress-Raw-Zlib
-                       %{name}-CPAN
-                       %{name}-CPANPLUS
-                       %{name}-Digest-SHA
-                       %{name}-ExtUtils-CBuilder
-                       %{name}-ExtUtils-Embed
-                       %{name}-ExtUtils-MakeMaker
-                       %{name}-ExtUtils-ParseXS
-                       %{name}-File-Fetch
-                       %{name}-IO-Compress
-                       %{name}-IO-Zlib
-                       %{name}-IPC-Cmd
-                       %{name}-Locale-Maketext-Simple
-                       %{name}-Log-Message
-                       %{name}-Log-Message-Simple
-                       %{name}-Module-Build
-                       %{name}-Module-CoreList
-                       %{name}-Module-Load
-                       %{name}-Module-Load-Conditional
-                       %{name}-Module-Loaded
-                       %{name}-Module-Plugable
-                       %{name}-Object-Accessor
-                       %{name}-Package-Constants
-                       %{name}-Params-Check
-                       %{name}-Parse-CPAN-Meta
-                       %{name}-Path-Tools
-                       %{name}-Pod-Simple
-                       %{name}-Term-UI
-                       %{name}-Test-Harness
-                       %{name}-Test-Simple
-                       %{name}-Time-Piece
-                       %{name}-parent
-                       %{name}-threads
-                       %{name}-threads-shared
-                       %{name}-version
+                       %{perl_requires}
+                       perl-libs
+                       perl-devel
+                       perl-Archive-Extract
+                       perl-Archive-Tar
+                       perl-Class-ISA
+                       perl-Compress-Raw-Zlib
+                       perl-CGI
+                       perl-CPAN
+                       perl-CPAN-Meta
+                       perl-CPAN-Meta-YAML
+                       perl-CPANPLUS
+                       perl-Carp
+                       perl-Digest
+                       perl-Digest-MD5
+                       perl-Digest-SHA
+                       perl-ExtUtils-CBuilder
+                       perl-ExtUtils-Embed
+                       perl-ExtUtils-MakeMaker
+                       perl-ExtUtils-ParseXS
+                       perl-File-Fetch
+                       perl-HTTP-Tiny
+                       perl-IO-Compress
+                       perl-IO-Zlib
+                       perl-IPC-Cmd
+                       perl-JSON-PP
+                       perl-Locale-Maketext-Simple
+                       perl-Log-Message
+                       perl-Log-Message-Simple
+                       perl-Module-Build
+                       perl-Module-CoreList
+                       perl-Module-Load
+                       perl-Module-Load-Conditional
+                       perl-Module-Loaded
+                       perl-Module-Metadata
+                       perl-Module-Plugable
+                       perl-Object-Accessor
+                       perl-Package-Constants
+                       perl-Params-Check
+                       perl-Parse-CPAN-Meta
+                       perl-Perl-OSType
+                       perl-Path-Tools
+                       perl-Pod-Simple
+                       perl-Scalar-List-Utils
+                       perl-Term-UI
+                       perl-Test-Harness
+                       perl-Test-Simple
+                       perl-Time-Piece
+                       perl-parent
+                       perl-threads
+                       perl-threads-shared
+                       perl-version
                end
 
                # Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
index 5c0459b028a9fa6c1fa3519bdb59858d16fea51b..18de1c24564023c9efc2a632fc80e2136c388895 100644 (file)
@@ -5,10 +5,10 @@
 
 name       = python-gudev
 version    = 147.1
-release    = 1
+release    = 2
 
 groups     = Development/Tools
-url        = http://flex.sourceforge.net/
+url        = http://www.kernel.org/pub/linux/utils/kernel/hotplug/gudev/
 license    = LGPLv3+
 summary    = Python (PyGObject) bindings to the GUDev library.
 
@@ -32,7 +32,7 @@ build
 
        DIR_APP = %{DIR_SRC}/nzjrs-python-gudev-5fac65a
 
-       CFLAGS += -I$(wildcard /usr/include/pygtk*)
+       CFLAGS += -I/usr/include/pygtk-2.0
 
        prepare_cmds
                ./autogen.sh
index dd4ea61bfb7ab415072a53d486d1094ced1ca22d..7ca7f0c866ce473c56fe19fc208ae1803ba9eaea 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = python
-version    = 2.7.1
-release    = 3
+version    = 2.7.2
+release    = 1
 thisapp    = Python-%{version}
 
 groups     = Development/Languages
@@ -21,8 +21,8 @@ description
        libraries, as well as to various windowing systems.
 end
 
-source_dl  =
-sources    = %{thisapp}.tgz
+source_dl  = http://python.org/ftp/python/%{version}/
+sources    = %{thisapp}.tar.xz
 
 build
        requires
@@ -44,7 +44,6 @@ build
        end
 
        export CFLAGS  += -D_GNU_SOURCE -fwrapv
-       export CPPFLAGS = $(shell pkg-config --cflags-only-I libffi)
 
        prepare_cmds
                sed -e "s/#*shared*/*shared*/g" -i Modules/Setup.dist
@@ -59,6 +58,8 @@ build
        end
 
        build
+               export CPPFLAGS=$(pkg-config --cflags-only-I libffi)
+
                OPT="%{CFLAGS}" \
                        ./configure \
                                --prefix=/usr \
@@ -78,12 +79,11 @@ end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-devel
                template DEVEL
        
-               files =+ \
+               files += \
                        !/usr/lib/python*/config/Makefile \
                        !/usr/include/python*/pyconfig.h
        end
index 32a912c11df39ff3ed4cde290b977cad1e8d5ca1..89d91a2d14650e7d2091fddcbdaa9ef994c294f5 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = radvd
-version    = 1.8
-release    = 4
+version    = 1.8.3
+release    = 2
 
 groups     = System/Daemons
 url        = http://www.litech.org/radvd/
@@ -41,6 +41,41 @@ end
 
 packages
        package %{name}
-               reuires = /lib/network/network-radvd-config
+               requires = /lib/network/network-radvd-config
+
+               prerequires += shadow-utils
+
+               script prein
+                       getent group radvd >/dev/null || groupadd -r radvd
+
+                       # The radvd user also needs to be in the wheel group to get access to
+                       # /proc.
+                       getent passwd radvd >/dev/null || \
+                               useradd -r -g radvd -G wheel -d / -s /sbin/nologin \
+                                       -c "User for the Router Advertisement daemon." radvd
+                       exit  0
+               end
+
+               # Just search for new unit files that were just installed.
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               # Disable the service that is to be removed and stop it if it is still running.
+               script preun
+                       /bin/systemctl --no-reload disable radvd.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop radvd.service >/dev/null 2>&1 || :
+               end
+
+               # Just tell systemd that unitfiles have been removed.
+               script postun
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               # Try to restart the service if it is running.
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart radvd.service >/dev/null 2>&1 || :
+               end
        end
 end
index 65e00822f1b3011c394091e0fed38052f247563b..1fb976ac503d6f7cc8968aee837ac5851a3c4628 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = rstp
 version    = 0.21
-release    = 5
+release    = 6
 
 groups     = Networking/Tools
 url        = http://git.ipfire.org/?p=thirdparty/rstp.git;a=summary
@@ -31,5 +31,19 @@ end
 
 packages
        package %{name}
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl --no-reload enable rstp.service >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable rstp.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop rstp.service >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart rstp.service >/dev/null 2>&1 || :
+               end
        end
 end
index b2d41f1806519021802c46d7d74c3d9ccb36c031..674e9d0f880c1b818f75af07c3bf39e72209ff0f 100644 (file)
@@ -1,4 +1,4 @@
-/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
+/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/cron {
     sharedscripts
     postrotate
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
index cb19dc454f4772e8e6ae1fccc3e859f625e7b95d..70362ae7f9b3f41493045a7ca6a594dfb3598fce 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = rsyslog
 version    = 5.8.0
-release    = 2
+release    = 3
 
 groups     = Base System/Daemons
 url        = http://www.rsyslog.com/
@@ -21,13 +21,8 @@ description
        relay chains.
 end
 
-provides  += syslog
-
 source_dl  = http://www.rsyslog.com/files/download/rsyslog/
 
-CFLAGS    += \
-       -DSYSLOGD_PIDNAME=\"syslogd.pid\"
-
 build
        requires
                gnutls-devel
@@ -36,6 +31,9 @@ build
                zlib-devel
        end
 
+       CFLAGS += \
+               -DSYSLOGD_PIDNAME=\"syslogd.pid\"
+
        configure_options += \
                --exec-prefix= \
                --libdir=/lib \
@@ -69,5 +67,31 @@ end
 packages
        package %{name}
                requires = logrotate
+               provides += syslog
+
+               prerequires = systemd-units
+
+               script postin
+                       for n in /var/log/{messages,secure,maillog,spooler}; do
+                               [ -f "${n}" ] && continue
+                               umask 066 && touch ${n}
+                       done
+
+                       /bin/systemctl enable rsyslog.service >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable rsyslog.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop rsyslog.service 2>&1 || :
+               end
+
+               script postun
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart rsyslog.service >/dev/null 2>&1 || :
+               end
        end
 end
index c7591cd644a742aa954eace22c398e5ccabab512..e50b083c1775520169e62a340c73872cba95ba60 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = samba
-version    = 3.5.11
-release    = 1
+version    = 3.6.0
+release    = 2
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -37,7 +37,9 @@ build
                automake
                avahi-devel
                cups-devel
+               gettext
                ncurses-devel
+               libacl-devel
                libcap-devel
                openldap-devel
                openssl-devel
@@ -45,6 +47,7 @@ build
                popt-devel
                readline-devel
                which
+               zlib-devel
        end
 
        DIR_APP = %{DIR_SRC}/%{thisapp}/source3
@@ -93,5 +96,8 @@ packages
        
        package %{name}-devel
                template DEVEL
+
+               requires += %{name}-libs=%{thisver}
        end
 end
+
index e8a9b8c9297050d4c73dade1cdc2ab6874a871d0..58641f3061a53842e88c88182b7e9b6cb9e8e675 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = setup
 version    = 3.0
-release    = 2
+release    = 3
 
 groups     = Base Build System/Base
 url        =
@@ -48,5 +48,22 @@ end
 packages
        package %{name}
                requires = iana-etc
+
+               configfiles
+                       /etc/aliases
+                       /etc/exports
+                       /etc/fstab
+                       /etc/group
+                       /etc/gshadow
+                       /etc/host.conf
+                       /etc/hosts
+                       /etc/hosts.allow
+                       /etc/hosts.deny
+                       /etc/motd
+                       /etc/passwd
+                       /etc/printcap
+                       /etc/shadow
+                       /etc/shells
+               end
        end
 end
index b8f0a14bff69a7700fe4140375dc1a939c945f19..e6fbf60ab7be90872c39da793f9feca8993a5ae1 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = shadow-utils
 version    = 4.1.4.3
-release    = 2
+release    = 5
 thisapp    = shadow-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -60,16 +60,23 @@ build
        install_cmds
                # Remove man pages in other languages
                rm -rfv %{BUILDROOT}/usr/share/man/{cs,de,fi,fr,hu,id,it,ja,pl,pt_BR,ru,sv,tr}
+
+               # Remove duplicate man pages.
+               rm -vf %{BUILDROOT}/usr/share/man/man*/{getspnam,nologin,passwd}.*
        end
 end
 
 packages
        package %{name}
-               obsoletes += shadow
+               obsoletes += shadow<%{thisver}
+               provides  += shadow=%{thisver}
 
                conflicts
-                       shadow
                        pam<1.1.0-4
                end
+
+               configfiles
+                       /etc/default/useradd
+               end
        end
 end
index 20d542dfb6ef299751e5608b6db4592e9f3e5ee3..9bb3e6c5e4de32059d5c7aba6889ad5b4fcaec69 100644 (file)
@@ -4,9 +4,9 @@
 ###############################################################################
 
 name       = squid
-version    = 3.1.12
 major_ver  = 3.1
-release    = 1
+version    = %{major_ver}.12
+release    = 2
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -38,7 +38,7 @@ build
                /usr/bin/smbclient
        end
 
-       export PKG_REQUIRES_FILTER = perl\(Authen::Smb\)
+       CFLAGS += -Wno-error
 
        configure_options += \
                --datadir=/usr/lib/squid \
@@ -101,5 +101,7 @@ end
 packages
        package %{name}
                requires = /usr/bin/smbclient
+
+               filter_requires = perl\(Authen::Smb\)
        end
 end
similarity index 91%
rename from systemd/patches/systemd-33-no_manpages.patch
rename to systemd/patches/systemd-36-no_manpages.patch
index b416d80335758b8aa6cc8772be55d129cf480581..5c5480fce635022581fe32eb1deba2c1d86ea5a5 100644 (file)
@@ -1,7 +1,7 @@
 diff -Nur a/Makefile.am b/Makefile.am
---- a/Makefile.am      2011-08-03 04:19:53.000000000 +0200
-+++ b/Makefile.am      2011-08-05 19:41:33.923993685 +0200
-@@ -692,81 +692,18 @@
+--- a/Makefile.am      2011-09-23 18:30:02.000000000 +0200
++++ b/Makefile.am      2011-10-09 16:44:18.293116056 +0200
+@@ -749,82 +749,13 @@
          src/dbus-loop.h \
          src/spawn-agent.h
  
@@ -42,6 +42,7 @@ diff -Nur a/Makefile.am b/Makefile.am
 -      man/systemd-logind.conf.5 \
 -      man/tmpfiles.d.5 \
 -      man/hostname.5 \
+-        man/timezone.5 \
 -      man/machine-id.5 \
 -      man/vconsole.conf.5 \
 -      man/locale.conf.5 \
@@ -53,12 +54,11 @@ diff -Nur a/Makefile.am b/Makefile.am
 -        man/systemd-loginctl.1
 +MANPAGES =
  
- if ENABLE_BINFMT
+-if ENABLE_BINFMT
 -MANPAGES += \
 -      man/binfmt.d.5
-+MANPAGES +=
-+
- endif
+-endif
++MANPAGES_ALIAS =
  
 -MANPAGES_ALIAS = \
 -      man/reboot.8 \
@@ -80,8 +80,6 @@ diff -Nur a/Makefile.am b/Makefile.am
 -dist_man_MANS = \
 -      $(MANPAGES) \
 -      $(MANPAGES_ALIAS)
-+MANPAGES_ALIAS =
-+
 +dist_man_MANS =
  
 -nodist_man_MANS = \
index 1ffaf3b8c71793aba962b2ebb76f22420e22b06a..322aea359a0dcb61d60f8ee905d1a7f40e01cf17 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = systemd
-version    = 33
+version    = 36
 release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
@@ -18,8 +18,6 @@ description
        SysV and LSB init scripts.
 end
 
-conflicts += upstart
-
 source_dl  = http://cgit.freedesktop.org/systemd/snapshot/
 
 build
@@ -31,6 +29,7 @@ build
                dbus-devel
                gperf
                intltool
+               libacl-devel
                libcap-devel
                libselinux-devel
                libtool
@@ -110,10 +109,14 @@ packages
                        dbus
                        python-cairo
                        python-dbus
+                       %{name}-units=%{thisver}
                        udev>=172
                        util-linux>=2.19
                end
 
+               prerequires += authconfig
+               conflicts += upstart
+
                script postin
                        # Generate Machine ID.
                        /bin/systemd-machine-id-setup > /dev/null 2>&1 || :
index 17815c5e357a043072f20116bdb531993cab7f7e..7b941f2bef0a0ad64a67bd754b0412468d4d1464 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = tcl
-version    = 8.5.8
+version    = 8.5.10
 release    = 1
 
 groups     = Development/Languages
@@ -21,16 +21,15 @@ end
 source_dl  = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
 sources    = tcl%{version}-src.tar.gz
 
-CFLAGS        += -DTCL_NO_STACK_CHECK=1
-
 build
        requires
+               perl>=5.14.2-9.ip3
                autoconf
                automake
        end
 
-
        DIR_APP = %{DIR_SRC}/tcl%{version}/unix
+       CFLAGS += -DTCL_NO_STACK_CHECK=1
 
        configure_options +=\
                --enable-shared
@@ -56,5 +55,4 @@ end
 
 packages
        package %{name}
-       end
 end
diff --git a/udev/console_init b/udev/console_init
deleted file mode 100644 (file)
index 1aaaf4d..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-is_true() {
-       [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ]
-}
-
-# Native English speakers probably don't have /etc/sysconfig/console at all
-if [ -f /etc/sysconfig/console ]; then
-       . /etc/sysconfig/console
-fi
-
-# Setting default values
-[ -z "$UNICODE" ] && UNICODE=1
-[ -z "$FONT" ] && FONT="LatArCyrHeb-16"
-
-device="/dev/$1"
-
-# Figure out the mode to set the console into
-if is_true "${UNICODE}"; then
-       echo -en '\033%G' > $device
-else
-       echo -en '\033%@' > $device
-fi
-
-# Setting font
-setfont ${FONT} -C $device
-
-# Setting up keyboard
-if [ -n "$KEYMAP" ]; then
-       if is_true "${UNICODE}"; then
-               loadkeys -u $KEYMAP >/dev/null
-       else
-               loadkeys $KEYMAP >/dev/null
-       fi
-       [ -n "$KEYMAP_CORRECTIONS" ] && \
-               loadkeys $KEYMAP_CORRECTIONS >/dev/null
-fi
diff --git a/udev/rules/10-console.rules b/udev/rules/10-console.rules
deleted file mode 100644 (file)
index 6e8c458..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# Console initialization - keyboard, font, etc.
-KERNEL=="tty0",                RUN+="/lib/udev/console_init %k"
-
-# Check and set up serial and serial-like consoles if necessary
-KERNEL=="console",     RUN+="/lib/udev/console_check %k"
-KERNEL=="ttySG*",      RUN+="/lib/udev/console_check %k"
-KERNEL=="xvc*",                RUN+="/lib/udev/console_check %k"
-KERNEL=="hvsi*",       RUN+="/lib/udev/console_check %k"
-KERNEL=="hvc*",                RUN+="/lib/udev/console_check %k"
index d7176ff324f21834eefaf359c3365ca85aa5f7ea..9e9416e27ae60b17e5fd1db16c3a1a2a2543759c 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = udev
 version    = 172
-release    = 2
+release    = 3
 
 groups     = Base System/Base
 url        = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
@@ -45,10 +45,6 @@ build
                --with-systemdsystemunitdir=/lib/systemd/system
 
        install_cmds
-               # Install rules
-               mkdir -pv %{BUILDROOT}/lib/udev/rules.d/
-               install -m644 -v %{DIR_SOURCE}/rules/*.rules %{BUILDROOT}/lib/udev/rules.d/
-
                # Install pkg-config files correctly
                mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib
 
@@ -59,8 +55,6 @@ build
                ln -svf ../../../../lib/udev/udev-acl \
                        %{BUILDROOT}/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
-               install -m 755 %{DIR_SOURCE}/console_init %{BUILDROOT}/lib/udev/
-
                # 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}
        end
@@ -68,12 +62,11 @@ end
 
 packages
        package %{name}
-       end
-       
+
        package lib%{name}
                template LIBS
        end
-       
+
        package lib%{name}-devel
                template DEVEL
        end
index faf915d8a84ba6252bf55934e2e2aba9f5d4112e..a385946aeb415dee6b42a945bd68c8c123dad83d 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = unzip
 version    = 6.0
-release    = 1
+release    = 3
 
 groups     = Applications/Archiving
 url        = ftp://ftp.info-zip.org/pub/infozip/src/
@@ -40,13 +40,16 @@ build
                CC="gcc %{CFLAGS}" \
                LD=gcc
 
-       make_install_targetsi += \
+       make_install_targets += \
                prefix=%{BUILDROOT}/usr \
                MANDIR=/usr/share/man/man1 \
                INSTALL="cp -p"
+
+       install_cmds
+               chown -v root.root %{BUILDROOT}/usr/bin/zipgrep
+       end
 end
 
 packages
        package %{name}
-       end
 end
index d403c9b549657784108db25878042d2339f765c3..36ab421cfb21566d0d9d7ae248c818689940370a 100644 (file)
@@ -6,7 +6,7 @@
 name       = util-linux
 version    = 2.19
 major_ver  = 2.19
-release    = 3
+release    = 7
 
 groups     = System/Base
 url        = http://kernel.org/~kzak/util-linux/
@@ -76,22 +76,17 @@ build
 
                # Remove deprecated commands
                rm -fv %{BUILDROOT}/{sbin,usr/share/man/man*}/{fsck,mkfs}.{bfs,minix}* \
-                       %{BUILDROOT}/usr/bin/chkdupexe %{BUILDROOT}/usr/bin/vi{gr,pw} \
-                       %{BUILDROOT}/sbin/{sln,shutdown} %{BUILDROOT}/bin/{line,newgrp,pg}
+                       %{BUILDROOT}/usr/{,s}bin/{chkdupexe,newgrp,vi{gr,pw}} \
+                       %{BUILDROOT}/sbin/{sln,shutdown} %{BUILDROOT}/bin/{line,pg}
+               rm -fv %{BUILDROOT}/usr/share/man/man1/{chkdupexe,line,pg,newgrp}.* \
+                       %{BUILDROOT}/usr/share/man/man8/{vipw,vigr}.*
                rm -fv %{BUILDROOT}/usr/share/getopt/*.tcsh
 
-               # Create /etc/mtab symlink
-               mkdir -pv %{BUILDROOT}/etc
-               ln -svf /proc/mounts %{BUILDROOT}/etc/mtab
-       end
-
-       export PKG_REQUIRES_FILTER = /proc/.*/mounts
-end
-
-# This symlink is allowed to be absolute.
-quality-agent
-       whitelist_symlink
-               /etc/mtab
+               # Set capabilities
+               chmod -v -s %{BUILDROOT}/bin/mount
+               setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}/bin/mount
+               chmod -v -s %{BUILDROOT}/bin/umount
+               setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}/bin/umount
        end
 end
 
@@ -109,8 +104,18 @@ packages
                        setup<3.0-2
                        util-linux-ng
                end
+
+               preprequires += coreutils
+
+               script postin
+                       touch /var/log/lastlog
+
+                       # mtab symlink
+                       rm -f /etc/mtab
+                       ln -s /proc/mounts /etc/mtab
+               end
        end
-       
+
        # Package information for libblkid
        package libblkid
                summary =  Block device ID library.
@@ -123,9 +128,9 @@ packages
                        /lib/libblkid.*
                end
        end
-       
+
        # Package information for libblkid-devel
-       package libblikid-devel
+       package libblkid-devel
                summary =  Development library and header of libblkid.
                description = %{summary}
        
@@ -136,7 +141,7 @@ packages
                        /usr/share/man/man3/*blkid*
                end
        end
-       
+
        # Package information for libuuid
        package libuuid
                summary =  Universally unique ID library.
@@ -149,7 +154,7 @@ packages
                        /lib/libuuid.*
                end
        end
-       
+
        # Package information for libuuid-devel
        package libuuid-devel
                summary =  Development library and header of libuuid.
@@ -162,7 +167,7 @@ packages
                        /usr/share/man/man3/*uuid*
                end
        end
-       
+
        # Package information for libmount
        package libmount
                summary =  Device mounting library.
@@ -175,7 +180,7 @@ packages
                        /lib/libmount.*
                end
        end
-       
+
        # Package information for libmount-devel
        package libmount-devel
                summary =  Development library and header of libmount.
index 07bf2a1b9682377e35297e7c19b48c8cb2103e43..f0a8e3992bd1fd64fdbc588a6d7b1e1c29965c57 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = xen
 version    = 4.1.1
-release    = 3
+release    = 4
 
 maintainer = Ben Schweikert <ben.schweikert@ipfire.org>
 groups     = Applications/Virtualization
@@ -32,7 +32,9 @@ build
                python
                python-devel
                sdl-devel
+               texinfo
                xorg-x11-proto-devel
+               wget
                zlib-devel
        end
 
@@ -40,8 +42,8 @@ build
                # Following two lines are disabling HVM. HVM does not work because \
                # of some PIE errors we get when we try to build the firmware part \
                # needed for different architektures.
-               sed -i -e '/^CONFIG_IOEMU := y$$/d' config/*.mk
-               sed -i -e '/SUBDIRS-$%{CONFIG_X86} += firmware/d' tools/Makefile
+               sed -i -e '/^CONFIG_IOEMU := y$/d' config/*.mk
+               sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' tools/Makefile
 
                rm -f Config.mk~
        end
@@ -65,8 +67,7 @@ end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-libs
                template LIBS
 
@@ -74,33 +75,33 @@ packages
                        This package contains the libraries needed to
                        run applications which manage Xen virtual machines
                end
-       
+
                files += /usr/lib/fs
        end
-       
+
        package %{name}-hypervisor
                summary = The Xen hypervisor.
                description
                        This package contains the Xen hypervisor.
                end
-       
+
                files
                        /boot/*
                end
        end
-       
+
        package %{name}-runtime
                summary = Runtime programms and daemons for Xen environments.
                description
                        This package contains the runtime programs
                        and daemons which form the core Xen userspace environment.
                end
-       
+
                files
                        /usr/bin/*
                end
        end
-       
+
        package %{name}-devel
                template DEVEL
 
index df9c317ab6cf23a1446cca8772b5de3d23c9a974..8bf368f33e5057762b84a129cb5ddcb7c0982de0 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = xorg-x11-font-utils
 version    = 7.4
-release    = 2
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = X/Fonts
@@ -66,6 +66,10 @@ build
                                make install DESTDIR=%{BUILDROOT}
                        fi
                done
+
+               # Install xorg-x11-fonts-update-dirs
+               install -m 0744 %{DIR_SOURCE}/xorg-x11-fonts-update-dirs %{BUILDROOT}/usr/bin/
+               sed -i "s:@DATADIR@:/usr/share:" %{BUILDROOT}/usr/bin/xorg-x11-fonts-update-dirs
        end
 end
 
diff --git a/xorg-x11-font-utils/xorg-x11-fonts-update-dirs b/xorg-x11-font-utils/xorg-x11-fonts-update-dirs
new file mode 100644 (file)
index 0000000..536bfe8
--- /dev/null
@@ -0,0 +1,60 @@
+#!/bin/sh
+# This script is used by the xorg-x11-fonts package in the %post stage for
+# some fonts to generate the right encodings.
+
+fontdir=""
+encodingsdir="@DATADIR@/X11/fonts/encodings"
+
+# some fonts need to skip mkfontscale, set to "yes" to skip
+skip_fontscale=""
+# some fonts need to run ttmkfdir, set to "yes" to run
+need_ttmkfdir=""
+
+if [ $# -lt 1 ]; then
+    echo "Need at least one parameter for font dir."
+    exit 1
+fi
+
+while [ $# != 0 ]; do
+    case $1 in
+        --skip-fontscale)
+        skip_fontscale="yes"
+        ;;
+        --need-ttmkfdir)
+        need_ttmkfdir="yes"
+        ;;
+        --encodingsdir)
+        shift
+        encodingsdir="$1"
+        ;;
+        *)
+        fontdir="$1"
+
+        if [ $# != 1 ]; then
+            echo "Too many parameters."
+            exit 1
+        fi
+        ;;
+    esac
+    shift
+done
+
+if [ "$skip_fontscale" != "yes" ]; then
+    mkfontscale $fontdir
+fi
+if [ "$need_ttmkfdir" = "yes" ]; then
+    ttmkfdir $fontdir
+fi
+
+mkfontdir $fontdir
+fc-cache $fontdir
+
+if ! [ -z "$encodingsdir" ]; then
+    [ -d "$encodingsdir" ] || mkdir -p "$encodingsdir"
+    oldpwd=$(pwd)
+    cd "$encodingsdir"
+    mkfontscale -n -e "$encodingsdir" -e "$encodingsdir/large"
+    cd ${oldpwd}
+fi
+
+
index 6b98ac6c323d629d1feb24118ce47000d44ba7f1..5744b319864a2497033cda6d569a80fcc4b0f807 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = xorg-x11-fonts
 version    = 7.2
-release    = 3
+release    = 4
 arch       = noarch
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
@@ -19,7 +19,8 @@ description
        Arabic fonts for use with X Window System.
 end
 
-source_dl = http://ftp.x.org/pub/individual/font/ http://unifoundry.com/
+source_dl  = http://ftp.x.org/pub/individual/font/
+source_dl += http://unifoundry.com/
 
 sources = \
        encodings-1.0.3.tar.bz2 \
@@ -113,11 +114,290 @@ build
                mkdir -pv %{BUILDROOT}/usr/share/X11/fonts/misc
                cp -vf %{DIR_DL}/unifont-5.1.20080820.pcf.gz \
                        %{BUILDROOT}/usr/share/X11/fonts/misc/unifont.pcf.gz
+
+               # XXX Do we need to create these symlinks to use the fonts - check this in a running X environment. 
+               # Install catalogue symlinks
+               #mkdir -pv %{BUILDROOT}/etc/X11/fontpath.d
+               #ln -svf ../../../usr/share/X11/fonts/100dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-100dpi
+               #ln -svf ../../../usr/share/X11/fonts/75dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-75dpi
+               #ln -svf ../../../usr/share/X11/fonts/cyrillic %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-cyrillic
+               #ln -svf ../../../usr/share/X11/fonts/misc %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-misc
+               #ln -svf ../../../usr/share/X11/fonts/Type1 %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-Type1
        end
 end
 
 packages
+       # Template for 75 DPI fonts
+       template 75DPI
+               requires
+                       fontconfig
+               end
+
+               #files
+               #       /etc/X11/fontpath.d/xorg-x11-fonts-75dpi
+               #end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/75dpi
+               end
+
+               script postun
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/75dpi
+               end
+       end
+
+       # Template for 100 DPI fonts
+       template 100DPI
+               requires
+                       fontconfig
+               end
+
+               #files
+               #       /etc/X11/fontpath.d/xorg-x11-fonts-100
+               #end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/100dpi
+               end
+
+               script postun
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/100dpi
+               end
+       end
+
        package %{name}
-               requires = fontconfig
+               summary = Bitmap fonts for the X Window System.
+               description
+                       This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic
+                       fonts for use with X Window System.
+               end
+
+               requires
+                       fontconfig
+               end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/misc
+               end
+
+               script postun
+                       /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/misc
+               end
+       end
+
+       package %{name}-Type1
+               summary = Type1 fonts provided by the X Window System.
+               description
+                       A collection of Type1 fonts which are part of the core X Window System
+                       distribution.
+               end
+
+               requires
+                       fontconfig
+               end
+
+               files
+                       /usr/share/X11/fonts/Type1/
+               end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/Type1
+               end
+
+               script postun
+                       /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/Type1
+               end
+       end
+
+       package %{name}-75dpi
+               template 75DPI
+
+               summary = A set of 75dpi resolution fonts for the X Window System.
+               description
+                       A set of 75 dpi fonts used by the X window system.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/
+       end
+
+       package %{name}-100dpi
+               template 100DPI
+
+               summary = A set of 100dpi resolution fonts for the X Window System.
+               description
+                       A set of 100 dpi fonts used by the X window system.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/
+       end
+
+       package %{name}-ISO8859-1-75dpi
+               template 75DPI
+
+               summary = A set of 75dpi ISO-8859-1 fonts for X.
+               description
+                       Contains a set of 75dpi fonts for ISO-8859-1.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-1.*
+       end
+
+       package %{name}-ISO8859-1-100dpi
+               template 100DPI
+
+               summary = A set of 100dpi ISO-8859-1 fonts for X.
+               description
+                       Contains a set of 100dpi fonts for ISO-8859-1.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-1.*
+       end
+
+       package %{name}-ISO8859-2-75dpi
+               template 75DPI
+
+               summary = A set of 75dpi Central European language fonts for X.
+               description
+                       Contains a set of 75dpi fonts for Central European languages.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-2.*
+       end
+
+       package %{name}-ISO8859-2-100dpi
+               template 100DPI
+
+               summary = A set of 100dpi Central European language fonts for X.
+               description
+                       Contains a set of 100dpi fonts for Central European languages.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-2.*
+       end
+
+       package %{name}-ISO8859-9-75dpi
+               template 75DPI
+
+               summary = ISO8859-9-75dpi fonts.
+               description
+                       Contains a set of 75dpi fonts for the Turkish language.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-9.*
+       end
+
+       package %{name}-ISO8859-9-100dpi
+               template 100DPI
+
+               summary = ISO8859-9-100dpi fonts.
+               description
+                       Contains a set of 100dpi fonts for the Turkish language.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-9.*
+       end
+
+       package %{name}-ISO8859-14-75dpi
+               template 75DPI
+
+               summary = ISO8859-14-75dpi fonts.
+               description
+                       Contains a set of 75dpi fonts in the ISO8859-14 encoding which
+                       provide Welsh support.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-14.*
+       end
+
+       package %{name}-ISO8859-14-100dpi
+               template 100DPI
+
+               summary = ISO8859-14-100dpi fonts.
+               description
+                       Contains a set of 100dpi fonts in the ISO8859-14 encoding which
+                       provide Welsh support.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-14.*
+       end
+
+       package %{name}-ISO8859-15-75dpi
+               template 75DPI
+
+               summary = ISO8859-15-75dpi fonts.
+               description
+                       Contains a set of 75dpi fonts in the ISO8859-15 encoding which
+                       provide Euro support.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-15.*
+       end
+
+       package %{name}-ISO8859-15-100dpi
+               template 100DPI
+
+               summary = ISO8859-15-100dpi fonts.
+               description
+                       Contains a set of 100dpi fonts in the ISO8859-15 encoding which
+                       provide Euro support.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-15.*
+       end
+
+       package %{name}-cyrillic
+               summary = Cyrillic fonts for X.
+               description
+                       Contains a set of Cyrillic fonts.
+               end
+
+               requires
+                       fontconfig
+               end
+
+               files
+                       /usr/share/X11/fonts/cyrillic/
+               end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/cyrillic
+               end
+
+               script postun
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/cyrillic
+               end
+       end
+
+       package %{name}-unifont
+               summary = The GNU unifont.
+               description
+                       GNU Unifont, contains glyphs for every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP).
+               end
+       
+               files
+                       /usr/share/X11/fonts/misc/unifont.pcf.gz        
+               end
        end
 end
index 83af5ad7cfbcc25e4b8f63143c0461d4feb0124d..a44f47278afb557c80fd4719a0c7d672091dd344 100644 (file)
--- a/xz/xz.nm
+++ b/xz/xz.nm
@@ -5,7 +5,7 @@
 
 name       = xz
 version    = 5.0.3
-release    = 1
+release    = 2
 
 groups     = Build Applications/Compression
 url        = http://tukaani.org/xz/
@@ -26,11 +26,11 @@ sources    = %{thisapp}.tar.xz
 packages
        package %{name}
 
-       package %{name}-devel
-               template DEVEL
-       end
-
        package %{name}-libs
                template LIBS
        end
+
+       package %{name}-devel
+               template DEVEL
+       end
 end