]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'stevee/gettext'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Sep 2011 17:43:21 +0000 (19:43 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Sep 2011 17:43:21 +0000 (19:43 +0200)
14 files changed:
ccache/ccache.nm
db4/db4.nm
dhcp/dhcp.nm
fuse/fuse.nm
gdb/gdb.nm
gnutls/gnutls.nm
initscripts/initscripts.nm
initscripts/src/Makefile
initscripts/src/console_check.c [deleted file]
libvirt/libvirt.nm
openssl/openssl.nm
openssl/patches/openssl-1.0.0e-version.patch [moved from openssl/patches/openssl-1.0.0d-version.patch with 57% similarity]
p11-kit/p11-kit.nm
systemd/systemd.nm

index fbc601cce5a1e69cb1f13f88e19a2b962df1cea8..c9569a231d9102ae75b7edfa28017321bd429bcd 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = ccache
-version    = 3.1.5
+version    = 3.1.6
 release    = 1
 
 groups     = Development/Compilers
@@ -20,7 +20,7 @@ description
 end
 
 source_dl  = http://samba.org/ftp/ccache/
-sources    = %{thisapp}.tar.bz2
+sources    = %{thisapp}.tar.xz
 
 # Sets ccache max size up to 2 GB
 CFLAGS += -DDEFAULT_MAXSIZE=2097152
@@ -64,5 +64,4 @@ end
 
 packages
        package %{name}
-       end
 end
index 53946992bc09ba419d9f16034ae7896b9a4ab136..6839448047cd830db137f0b69d45bacadb8050ad 100644 (file)
@@ -19,11 +19,11 @@ license    = Proprietary
 summary    = Berkeley DB is a library that provides an embedded database.
 
 description
-       Berkeley DB (BDB) is a computer software library that provides \
+       Berkeley DB (BDB) is a computer software library that provides
        a high-performance embedded database.
 end
 
-source_dl  =
+source_dl  = http://download.oracle.com/berkeley-db/
 
 build
        requires
@@ -49,21 +49,31 @@ build
        end
 end
 
-# XXX insert descriptions
 packages
        package db4
-               files = /usr/lib*/libdb-%{version_major}.so
-       end
        
        package db4-devel
                template DEVEL
+
+               files += \
+                       !/usr/lib*/libdb-%{version_major}.so
        end
        
        package db4-utils
-               files = /usr/bin
+               summary = Command line tools for managing Berkeley DB (version 4) databases.
+               description = %{summary}
+
+               files
+                       /usr/bin
+               end
        end
        
        package db4-cxx
-               files = /usr/lib*/libdb_cxx-%{version_major}.so
+               summary = The Berkeley DB database library (version 4) for C++.
+               description = %{summary}
+
+               files
+                       /usr/lib*/libdb_cxx-%{version_major}.so
+               end
        end
 end
index 643d35bc92f00ed10f79a1a4385f90e1c08b2d03..a60868ddbf6cb720f56e6e7387b1a0534c4e69b2 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = dhcp
 version    = 4.2.1-P1
-release    = 1
+release    = 2
 
 groups     = Networking/Daemons
 url        = http://isc.org/products/DHCP/
@@ -27,9 +27,9 @@ build
                --sysconfdir=/etc \
                --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \
                --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
-               --with-srv-pid-file=/var/run/dhcpd.pid \
-               --with-cli-pid-file=/var/run/dhclient.pid \
-               --with-relay-pid-file=/var/run/dhcrelay.pid
+               --with-srv-pid-file=/run/dhcpd.pid \
+               --with-cli-pid-file=/run/dhclient.pid \
+               --with-relay-pid-file=/run/dhcrelay.pid
 
        install_cmds
                rm -vf %{BUILDROOT}/etc/dhclient.conf
@@ -41,7 +41,14 @@ build
 
                install -v -m 755 %{DIR_SOURCE}/dhclient-script \
                        %{BUILDROOT}/sbin/dhclient-script
+
+               # Create runtime folders.
                mkdir -pv %{BUILDROOT}/var/lib/dhclient
+               mkdir -pv %{BUILDROOT}/var/lib/dhcpd
+
+               # Create empty lease files.
+               touch %{BUILDROOT}/var/lib/dhclient/dhclient.leases
+               touch %{BUILDROOT}/var/lib/dhcpd/dhcpd.leases
 
                # Remove header files.
                # There is nothing that makes use out of them.
index 35c30d5a4000b2c6963e9e0e8f3ddac035f1d2ab..e8fe47d00c54fa8be6f9a90d34c349f2fc0dc3f7 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = fuse
-version    = 2.8.5
+version    = 2.8.6
 release    = 1
 
 groups     = System/Filesystems
@@ -13,23 +13,26 @@ license    = GPL+
 summary    = File System in Userspace (FUSE) utilities.
 
 description
-       With FUSE it is possible to implement a fully functional \
-       filesystem in a userspace program. This package contains the \
+       With FUSE it is possible to implement a fully functional
+       filesystem in a userspace program. This package contains the
        FUSE userspace tools to mount a FUSE filesystem.
 end
 
-source_dl  =
+source_dl  = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
 
 build
        requires
                libselinux-devel
        end
 
+       CFLAGS += -D_GNU_SOURCE
+
        configure_options += \
                --disable-static \
                --disable-rpath
 
        install_cmds
+               # Remove old sysvinit directory.
                rm -vrf %{BUILDROOT}/etc/init.d
 
                # Remove /dev/fuse which cannot be packaged.
index f09032ecf3bf2ce78438270cb2082953d35f4d49..7c377584ce9fb6b7e221c75a10d4ec44880864f1 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = gdb
-version    = 7.2
+version    = 7.3.1
 release    = 1
 
 groups     = Development/Debuggers
@@ -18,8 +18,8 @@ description
        and printing their data.
 end
 
-source_dl  =
-sources    = %{thisapp}.tar.bz2
+source_dl  = ftp://ftp.gnu.org/gnu/gdb/
+sources    = %{thisapp}.tar.gz
 
 build
        requires
index 04376dc0ff2de142da53ad5df283d896c17d9709..e321030d7938d33632e2cd96593c56d86d05d30d 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = gnutls
-version    = 3.0.0
+version    = 3.0.3
 release    = 1
 
 groups     = System/Libraries
@@ -19,14 +19,14 @@ description
        TLS working group.
 end
 
-source_dl  =
+source_dl  = ftp://ftp.gnu.org/gnu/gnutls/
 sources    = %{thisapp}.tar.xz
 
 build
        requires
                libtasn1-devel
                nettle-devel
-               p11-kit-devel
+               p11-kit-devel>=0.4
                zlib-devel
        end
 
@@ -44,6 +44,10 @@ end
 
 packages
        package %{name}
+               requires
+                       p11-kit>=0.4
+               end
+       end
 
        package %{name}-devel
                template DEVEL
index c4fe57285cd572ddfcc047b66afba6d1505e7d79..ca0e7af051dd1dc19497248f8cf0065e3c56cfcf 100644 (file)
@@ -6,7 +6,7 @@
 name       = initscripts
 epoch      = 1
 version    = 2.99
-release    = 5
+release    = 6
 
 groups     = Base System/Boot
 url        =
index 92fc67057af6e03ac32291be386c7704b634cabe..9a979e40666489fddbafc3b7fafed84113ac8e41 100644 (file)
@@ -1,5 +1,5 @@
 
-PROGS = console_check console_init ipcalc securetty
+PROGS = console_init 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_check $(DESTDIR)/lib/udev/
        install -v -m 755 console_init $(DESTDIR)/lib/udev/
        install -v -m 755 ipcalc $(DESTDIR)/bin
        install -v -m 755 securetty $(DESTDIR)/sbin
@@ -26,9 +25,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_check: console_check.o
-       $(CC) $(LDFLAGS) -o $@ $<
-
 console_init: console_init.o shvar.o
        $(CC) $(LDFLAGS) $(shell pkg-config --libs glib-2.0) -o $@ $?
 
diff --git a/initscripts/src/console_check.c b/initscripts/src/console_check.c
deleted file mode 100644 (file)
index 740f2a8..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-
-#include <sys/ioctl.h>
-
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-
-struct speeds
-{
-       speed_t speed;
-       unsigned long value;
-};
-
-struct speeds speed_map[] =
-{
-       {B50, 50},
-       {B75, 75},
-       {B110, 110},
-        {B134, 134},
-        {B150, 150},
-        {B200, 200},
-        {B300, 300},
-        {B600, 600},
-        {B1200, 1200},
-        {B1800, 1800},
-        {B2400, 2400},
-        {B4800, 4800},
-        {B9600, 9600},
-        {B19200, 19200},
-        {B38400, 38400},
-#ifdef B57600
-       {B57600, 57600},
-#endif
-#ifdef B115200
-       {B115200, 115200},
-#endif
-#ifdef B230400
-       {B230400, 230400},
-#endif
-#ifdef B460800
-       {B460800, 460800},
-#endif
-       {0, 0}
-};
-
-int termcmp(struct termios *a, struct termios *b) {
-       if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag ||
-           a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag ||
-           cfgetispeed(a) != cfgetispeed(b) || cfgetospeed(a) != cfgetospeed(b))
-               return 1;
-       return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc));
-}
-
-int get_serial_speed(int fd) {
-       struct termios mode;
-
-       if (!tcgetattr(fd, &mode)) {
-               int i;
-               speed_t speed;
-
-               speed = cfgetospeed(&mode);
-               for (i = 0; speed_map[i].value != 0; i++)
-                       if (speed_map[i].speed == speed)
-                               return speed_map[i].value;
-       }
-       return 0;
-}
-
-int compare_termios_to_console(char *dev, int *speed) {
-       struct termios cmode, mode;
-       int fd, cfd;
-
-       cfd = open ("/dev/console", O_RDONLY);
-       tcgetattr(cfd, &cmode);
-       close(cfd);
-
-       fd = open(dev, O_RDONLY|O_NONBLOCK);
-       tcgetattr(fd, &mode);
-
-       if (!termcmp(&cmode, &mode)) {
-               *speed = get_serial_speed(fd);
-               close(fd);
-               return 1;
-       }
-       close(fd);
-       return 0;
-}
-
-char *serial_tty_name(int type) {
-       switch (type) {
-               case PORT_8250...PORT_MAX_8250:
-                       return "ttyS";
-               case PORT_PMAC_ZILOG:
-                       return "ttyPZ";
-               case PORT_MPSC:
-                       return "ttyMM";
-               case PORT_CPM:
-                       return "ttyCPM";
-               case PORT_MPC52xx:
-                       return "ttyPSC";
-               default:
-                       return NULL;
-       }
-}
-
-char *check_serial_console(int *speed) {
-       int fd;
-       char *ret = NULL, *device;
-       char twelve = 12;
-       struct serial_struct si, si2;
-       char *tty_name;
-
-       memset(&si, 0, sizeof(si));
-       memset(&si2, 0, sizeof(si));
-
-       fd = open("/dev/console", O_RDWR);
-       if (ioctl (fd, TIOCLINUX, &twelve) >= 0)
-               goto out;
-
-       if (ioctl(fd, TIOCGSERIAL, &si) < 0)
-               goto out;
-       close(fd);
-
-       tty_name = serial_tty_name(si.type);
-       if (!tty_name)
-               goto out;
-
-       asprintf(&device, "%s%d", tty_name, si.line);
-       fd = open(device, O_RDWR|O_NONBLOCK);
-       if (fd == -1)
-               goto out;
-
-       if (ioctl(fd, TIOCGSERIAL, &si2) < 0)
-               goto out;
-
-       if (memcmp(&si,&si2, sizeof(si)))
-               goto out;
-
-       *speed = get_serial_speed(fd);
-       ret = device;
-out:
-       close(fd);
-       return ret;
-}
-
-int emit_console_event(char *dev, int speed) {
-       char *args[] = { "initctl", "emit", "--no-wait", "serial-console-available", NULL, NULL, NULL };
-
-       asprintf(&args[4],"DEV=%s", dev);
-       if (speed)
-               asprintf(&args[5],"SPEED=%d", speed);
-       execv("/sbin/initctl", args);
-       return 1;
-}
-
-int main(int argc, char **argv) {
-       char *device;
-       int speed;
-
-       if (argc < 2) {
-               printf("usage: console_check <device>\n");
-               exit(1);
-       }
-       chdir("/dev");
-       device = argv[1];
-       if (!strcmp(device, "console")) {
-               device = check_serial_console(&speed);
-               if (device)
-                       return emit_console_event(device, speed);
-       } else if (compare_termios_to_console(device, &speed)) {
-               return emit_console_event(device, speed);
-       }
-       return 0;
-}
index 7618b543a783e9f528198ed39f6e107807e352d2..90d50a645929f05b5f3d933b21331f4ef7b57a3f 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libvirt
-version    = 0.9.0
-release    = 3
+version    = 0.9.6
+release    = 1
 
 groups     = Applications/Virtualization
 url        = http://www.libvirt.org/
index fd66c78002ad4ec7392e36306ef0878324364ae7..278f3e13f6651c248e807da586db4ac64b8c5565 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = openssl
-version    = 1.0.0d
-release    = 3
+version    = 1.0.0e
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -19,7 +19,7 @@ description
        libraries which provide various cryptographic algorithms and protocols.
 end
 
-source_dl  =
+source_dl  = http://openssl.org/source/
 
 build
        requires
similarity index 57%
rename from openssl/patches/openssl-1.0.0d-version.patch
rename to openssl/patches/openssl-1.0.0e-version.patch
index da50fb4f94ee4f0b6caacab39d4742b81c2aad1a..0a45f74b0514722daef8bc9f93eec003ebe35858 100644 (file)
@@ -1,22 +1,22 @@
-diff -up openssl-1.0.0d/crypto/opensslv.h.version openssl-1.0.0d/crypto/opensslv.h
---- openssl-1.0.0d/crypto/opensslv.h.version   2011-02-10 14:24:52.000000000 +0100
-+++ openssl-1.0.0d/crypto/opensslv.h   2011-02-10 14:48:00.000000000 +0100
+diff -up openssl-1.0.0e/crypto/opensslv.h.version openssl-1.0.0e/crypto/opensslv.h
+--- openssl-1.0.0e/crypto/opensslv.h.version   2011-09-07 13:55:52.000000000 +0200
++++ openssl-1.0.0e/crypto/opensslv.h   2011-09-07 13:59:28.000000000 +0200
 @@ -25,7 +25,8 @@
   * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
   *  major minor fix final patch/beta)
   */
--#define OPENSSL_VERSION_NUMBER        0x1000004fL
+-#define OPENSSL_VERSION_NUMBER        0x1000005fL
 +/* we have to keep the version number to not break the abi */
 +#define OPENSSL_VERSION_NUMBER        0x10000003
  #ifdef OPENSSL_FIPS
- #define OPENSSL_VERSION_TEXT  "OpenSSL 1.0.0d-fips 8 Feb 2011"
+ #define OPENSSL_VERSION_TEXT  "OpenSSL 1.0.0e-fips 6 Sep 2011"
  #else
 @@ -83,7 +84,7 @@
   * should only keep the versions that are binary compatible with the current.
   */
  #define SHLIB_VERSION_HISTORY ""
 -#define SHLIB_VERSION_NUMBER "1.0.0"
-+#define SHLIB_VERSION_NUMBER "1.0.0d"
++#define SHLIB_VERSION_NUMBER "1.0.0e"
  
  
  #endif /* HEADER_OPENSSLV_H */
index 7bd7b235989076bd6355f94f8fb64114f5581f68..a805983aa7d5cf569c96febc95205ed29fd36f89 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = p11-kit
-version    = 0.3
+version    = 0.7
 release    = 1
 
 groups     = System/Libraries
@@ -21,12 +21,15 @@ description
        components or libraries living in the same process.
 end
 
-source_dl  =
+source_dl  = http://p11-glue.freedesktop.org/releases/
+
+build
+       configure_options += --sysconfdir=/etc
+end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-devel
                template DEVEL
        end
index 51aa583c606fd4e66596f69a6c2ab8c2ef1974c1..1af5065e53bd998267f541db0c25e009dea028d7 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 33
-release    = 1
+release    = 2
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -106,7 +106,12 @@ end
 
 packages
        package %{name}
-               requires = dbus python-cairo python-dbus udev>=172
+               requires
+                       dbus
+                       python-cairo
+                       python-dbus udev>=172
+                       util-linux>=2.19
+               end
        end
        
        # Package information for systemd-units