[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e13e787b8dc0285db4a7ddd235b9235b768610a2 - IPFire-SCM

13 Nov 2011

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  e13e787b8dc0285db4a7ddd235b9235b768610a2 (commit)
       via  fe01403819e6518baf7f23908971a6892f0b9b8a (commit)
       via  670864d7a38283e09b85935179696d2055fcc6cd (commit)
       via  5dd4e23ac65e31be668e0d36ab064ac7ccc5d3f3 (commit)
       via  96ca3af59772f525a8690e6158ad8d20aa4f41ce (commit)
       via  b912ff3d88399d7a5494e67783e619183e70026e (commit)
       via  aa3ab846892206d516ef181dd7ba8d9414910638 (commit)
       via  8c4690088dfcda730381e89edccd5e8ecbdd5f8e (commit)
       via  4d4e8902d60528f2a38b03ff9e466cf0c902f2cb (commit)
      from  efd012369bee0e9a25e5f56c5b3483f6cfa261a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e13e787b8dc0285db4a7ddd235b9235b768610a2
Merge: fe01403 b912ff3
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Nov 13 14:08:35 2011 +0100
Merge remote-tracking branch 'stevee/isdn'
commit fe01403819e6518baf7f23908971a6892f0b9b8a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Nov 13 14:06:22 2011 +0100
kernel: Add source download URL and switch to xz tarball.
commit 670864d7a38283e09b85935179696d2055fcc6cd
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Nov 13 10:00:26 2011 +0100
kernel: Make sure the prerequirements are always there.
commit 5dd4e23ac65e31be668e0d36ab064ac7ccc5d3f3
Merge: 96ca3af aa3ab84
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Nov 13 09:59:35 2011 +0100
Merge branch 'grubby'
commit 96ca3af59772f525a8690e6158ad8d20aa4f41ce
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Nov 13 09:55:13 2011 +0100
kernel: Disable mISDN stack.
mISDN is disabled, because we currently do not have any use for
    it and it is making trouble with automatic loading of hisax.
    When you plug in ISDN hardware it might get initialized first
    and block the card for hisax for being used.
commit b912ff3d88399d7a5494e67783e619183e70026e
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Nov 11 21:12:16 2011 +0100
ibod: Add patch for configuration cli, add systemd file.
Fixes #285.
    Add a patch to add the option to specify the used config file.
commit aa3ab846892206d516ef181dd7ba8d9414910638
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Nov 10 19:16:48 2011 +0100
kernel: Generate initramfs and manage bootloader conf by grubby.
commit 8c4690088dfcda730381e89edccd5e8ecbdd5f8e
Merge: 4d4e890 b8b2278
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Nov 9 23:47:35 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into grubby
commit 4d4e8902d60528f2a38b03ff9e466cf0c902f2cb
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Nov 9 23:43:22 2011 +0100
grubby: New package.
-----------------------------------------------------------------------
Summary of changes:
 grubby/grubby.nm                              |   42 ++++++++++++++
 ibod/ibod.nm                                  |   20 ++++++-
 ibod/patches/ibod-1.4-configuration-cli.patch |   74 +++++++++++++++++++++++++
 ibod/systemd/ibod@.service                    |   10 +++
 kernel/config.i686                            |   22 +------
 kernel/config.i686-PAE                        |   22 +------
 kernel/kernel.nm                              |   37 +++++++++++--
 7 files changed, 183 insertions(+), 44 deletions(-)
 create mode 100644 grubby/grubby.nm
 create mode 100644 ibod/patches/ibod-1.4-configuration-cli.patch
 create mode 100644 ibod/systemd/ibod@.service
Difference in files:

diff --git a/grubby/grubby.nm b/grubby/grubby.nm
new file mode 100644
index 0000000..894b5a2
--- /dev/null
+++ b/grubby/grubby.nm
@@ -0,0 +1,42 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = grubby
+version    = 8.3
+release    = 1
+
+groups     = System/Base
+url        = http://git.fedorahosted.org/git/grubby.git
+license    = GPLv2+
+summary    = Command line tool for updating bootloader configs.
+
+description
+	grubby  is  a command line tool for updating and displaying information about 
+	the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc)  
+	and zipl (s390) boot loaders. It is primarily designed to be used from scripts
+	which install new kernels and need to find information about the current boot 
+	environment.
+end
+
+sources = %{thisapp}.tar.bz2
+
+build
+	requires
+		glib2-devel
+		libblkid-devel
+		popt-devel
+		util-linux
+	end
+
+	test
+		make test
+	end
+
+	make_install_targets += mandir=/usr/share/man
+end
+
+packages
+	package %{name}
+end
diff --git a/ibod/ibod.nm b/ibod/ibod.nm
index 5827b18..84f4111 100644
--- a/ibod/ibod.nm
+++ b/ibod/ibod.nm
@@ -5,7 +5,7 @@
name       = ibod
 version    = 1.4
-release    = 1
+release    = 2
groups     = Networking/Tools
 url        = http://www.datenwelt.net/oss/ibod/
@@ -40,5 +40,23 @@ packages
    	configfiles
    		/etc/isdn/ibod.cf
    	end
+
+		prerequires += systemd-units
+
+		# There isn't any chance at the moment to determine the names of
+		# spawned instances by a systemd service file.
+		#
+		# So we aren't able to stop any ibod process before uninstalling the package. 
+		script postin
+			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postun
+			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+		end
    end
 end
diff --git a/ibod/patches/ibod-1.4-configuration-cli.patch b/ibod/patches/ibod-1.4-configuration-cli.patch
new file mode 100644
index 0000000..656d479
--- /dev/null
+++ b/ibod/patches/ibod-1.4-configuration-cli.patch
@@ -0,0 +1,74 @@
+Author: Michael Tremer michael.tremer@ipfire.org
+
+diff -Nur ibod-1.4/ibod.c ibod-1.4-conf/ibod.c
+--- ibod-1.4/ibod.c	2000-04-11 05:34:17.000000000 +0000
++++ ibod-1.4-conf/ibod.c	2011-11-11 18:50:45.510054466 +0000
+@@ -23,7 +23,7 @@
+ static void get_if_state();
+ static int bring_up_slave();
+ static int bring_down_slave();
+-static char *home;
++static char *config_file;
+ static Conf cf;
+ static struct timeval timeout, tv_last, tv_up;
+ static int usageflags[ISDN_MAX_CHANNELS];
+@@ -48,12 +48,16 @@
+ 
+     channels_last = -1;
+ 
++
+     /* Find out where to look for configuration file */
+-    if ((home = getenv("IBOD_HOME")) == NULL)
+-        home = IBOD_DEFAULT_DIR;
++    if (argc > 1) {
++        config_file = argv[1];
++    } else {
++        config_file = IBOD_DEFAULT_CONF;
++    }
+ 
+     /* Setup initial attributes */
+-    if (setattr(home) == -1) {
++    if (setattr(config_file) == -1) {
+         closelog();
+         exit(1);
+     }
+@@ -185,10 +189,9 @@
+ }
+ 
+ 
+-static int setattr(char *home)
++static int setattr(char *config_filename)
+ {
+     FILE *fd;
+-    char config_filename[MAX_STR_LEN];
+     char linebuf[MAX_STR_LEN];
+     char *key, *value;
+     int  val;
+@@ -202,7 +205,6 @@
+     cf.stayup_time = STAYUP_TIME;
+ 
+     /* Open config file */
+-    sprintf(config_filename, "%s/ibod.cf", home);
+     if ((fd = fopen(config_filename, "r")) == NULL) {
+         syslog(LOG_ERR, "%s: %s\n", config_filename, strerror(errno));
+         return -1;
+@@ -288,7 +290,7 @@
+ 
+ static void reread(int sig)
+ {
+-    (void) setattr(home);
++    (void) setattr(config_file);
+ 
+     setinterval();
+ 
+diff -Nur ibod-1.4/ibod.h ibod-1.4-conf/ibod.h
+--- ibod-1.4/ibod.h	2011-11-11 19:00:45.623454321 +0000
++++ ibod-1.4-conf/ibod.h	2011-11-11 18:45:39.703353901 +0000
+@@ -11,6 +11,7 @@
+ #define STAYUP_TIME		30
+ 
+ #define IBOD_DEFAULT_DIR	"/etc/isdn"
++#define IBOD_DEFAULT_CONF	IBOD_DEFAULT_DIR "/ibod.cf"
+ #define MAX_STR_LEN		512
+ #define ISDN_INFO_DEV		"/dev/isdninfo"
+ #define ISDN_CTLR_DEV		"/dev/isdnctrl"
diff --git a/ibod/systemd/ibod@.service b/ibod/systemd/ibod@.service
new file mode 100644
index 0000000..a2fde5c
--- /dev/null
+++ b/ibod/systemd/ibod@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=ibod on %I
+BindTo=dev-%I.device
+After=dev-%I.device network.service
+Requires=network.service
+
+[Service]
+ExecStart=/usr/bin/ibod /run/network/isdn/%I/ibod.cf
+UtmpIdentifier=%I
+KillMode=process
diff --git a/kernel/config.i686 b/kernel/config.i686
index d74b937..44d6990 100644
--- a/kernel/config.i686
+++ b/kernel/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.4-7.2.ip3.i686 Kernel Configuration
+# Linux/i386 3.0.4-9.ip3.i686 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1950,7 +1950,7 @@ CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
 CONFIG_IPPP_FILTER=y
-# CONFIG_ISDN_PPP_BSDCOMP is not set
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 CONFIG_ISDN_TTY_FAX=y
@@ -2050,23 +2050,7 @@ CONFIG_GIGASET_M101=m
 # CONFIG_GIGASET_DEBUG is not set
 CONFIG_HYSDN=m
 CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
+# CONFIG_MISDN is not set
 CONFIG_ISDN_HDLC=m
 # CONFIG_PHONE is not set
diff --git a/kernel/config.i686-PAE b/kernel/config.i686-PAE
index d26773a..2b374db 100644
--- a/kernel/config.i686-PAE
+++ b/kernel/config.i686-PAE
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.4-7.2.ip3.i686 Kernel Configuration
+# Linux/i386 3.0.4-9.ip3.i686.PAE Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1965,7 +1965,7 @@ CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
 CONFIG_IPPP_FILTER=y
-# CONFIG_ISDN_PPP_BSDCOMP is not set
+CONFIG_ISDN_PPP_BSDCOMP=m
 CONFIG_ISDN_AUDIO=y
 CONFIG_ISDN_TTY_FAX=y
@@ -2065,23 +2065,7 @@ CONFIG_GIGASET_M101=m
 # CONFIG_GIGASET_DEBUG is not set
 CONFIG_HYSDN=m
 CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
+# CONFIG_MISDN is not set
 CONFIG_ISDN_HDLC=m
 # CONFIG_PHONE is not set
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index d9e90d4..347a3f6 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name       = kernel
 version    = 3.0.4
-release    = 8
+release    = 10
 thisapp    = linux-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org
@@ -25,7 +25,8 @@ end
 localversion = %{release}.%{DISTRO_DISTTAG}.%{DISTRO_ARCH}
 fullver      = %{version}-%{localversion}
-sources      = %{thisapp}.tar.gz
+source_dl    = http://www.kernel.org/pub/linux/kernel/v3.x/
+sources      = %{thisapp}.tar.xz
build
    # icecream cannot be used to compile the kernel.
@@ -222,14 +223,15 @@ end
packages
    template KERNEL
+		kernel_name = kernel
    	kernel_release = %{fullver}
summary = The Linux kernel %{kernel_release}.
-		prerequires = module-init-tools
+		prerequires = dracut grubby module-init-tools
    	provides = kernel
    	requires
-			dracut
+			%{prerequires}
    		linux-firmware
    	end
@@ -241,8 +243,29 @@ packages
    		/lib/modules/%{kernel_release}
    	end
+		_posttrans
+			/sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmod --update %{kernel_release} || exit $?
+			/sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_release} || exit $?
+		end
+
    	script posttransin
-			dracut --force /boot/initramfs-%{kernel_release}.img %{kernel_release}
+			%{_posttrans}
+		end
+
+		script posttransup
+			%{_posttrans}
+		end
+
+		script postin
+			/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --install %{KVERREL}%{?-v:.%{-v*}}
+		end
+
+		script postup
+			/sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release}
+		end
+
+		script preun
+			/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{kernel_release}
    	end
    end
@@ -271,24 +294,28 @@ packages
    package kernel
    	template KERNEL
+		kernel_name = kernel
    	kernel_release = %{fullver}
    end
package kernel-devel
    	template KERNELDEVEL
+		kernel_name = kernel
    	kernel_release = %{fullver}
    end
package kernel-PAE
    	template KERNEL
+		kernel_name = kernel-PAE
    	kernel_release = %{fullver}.PAE
    end
package kernel-PAE-devel
    	template KERNELDEVEL
+		kernel_name = kernel-PAE
    	kernel_release = %{fullver}.PAE
    end
hooks/post-receive
--
IPFire 3.x development tree

    