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

24 Apr 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  c0b61a2767e2e114938b937e80ed80056006441c (commit)
       via  38f61c37315c989631207627cb1669a53c6afdaa (commit)
       via  4a3792cec4c240cee58fcbb05d36da2dac8f39f7 (commit)
       via  09a33cac6eb64294c4fec0fe47b5821abc4bbd4f (commit)
       via  e0420b148305656f6fba0bff4939868c32f8891f (commit)
       via  6437de27a73da992fde38de059a6c73ed3209e48 (commit)
       via  cacad81be96c3bfcc4f89d8431ed72452c6ba300 (commit)
       via  fabb88ef457ab1af0c7659c4033dd5023fbf9c29 (commit)
       via  b121fbcffadd95dc6fd5f3f87ade174f2b94ba08 (commit)
       via  bcb8bf117c85fde7b63f56f2e27b1a7d031ec9a7 (commit)
       via  00ff9ab1fe77a5f25336c7dc44407865f04b8c74 (commit)
       via  b7eab83e54695001a6f4512fbaf2d351725be1ef (commit)
      from  ce0a9c936db28a7cac63dcbb06455c7288b75a27 (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 c0b61a2767e2e114938b937e80ed80056006441c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Apr 24 16:02:48 2011 +0200
gcc: Remove hard dependency to ppl package.
This was just used to trick the solver.
commit 38f61c37315c989631207627cb1669a53c6afdaa
Merge: 4a3792c 6437de2
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Apr 24 16:01:43 2011 +0200
Merge remote-tracking branch 'stevee/improvements'
commit 4a3792cec4c240cee58fcbb05d36da2dac8f39f7
Merge: 09a33ca b121fbc
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Apr 24 16:01:39 2011 +0200
Merge remote-tracking branch 'stevee/pyserial'
commit 09a33cac6eb64294c4fec0fe47b5821abc4bbd4f
Merge: e0420b1 bcb8bf1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Apr 24 16:01:32 2011 +0200
Merge remote-tracking branch 'maniacikarus/lzo'
commit e0420b148305656f6fba0bff4939868c32f8891f
Merge: b7eab83 00ff9ab
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Apr 24 16:01:29 2011 +0200
Merge remote-tracking branch 'maniacikarus/acpid'
commit 6437de27a73da992fde38de059a6c73ed3209e48
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 24 15:10:27 2011 +0200
cpufrequtils: Some cosmetic fixes.
commit cacad81be96c3bfcc4f89d8431ed72452c6ba300
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 24 14:30:14 2011 +0200
telnet: Some cosmetic fixes.
commit fabb88ef457ab1af0c7659c4033dd5023fbf9c29
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 24 13:56:53 2011 +0200
clamav: Some small cosmetic fixes.
commit b121fbcffadd95dc6fd5f3f87ade174f2b94ba08
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Sun Apr 24 11:43:35 2011 +0200
pyserial: New package.
Fixes #186.
commit bcb8bf117c85fde7b63f56f2e27b1a7d031ec9a7
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Sat Apr 23 20:47:15 2011 +0200
lzo: Update to version 2.05.
Fixes #185
commit 00ff9ab1fe77a5f25336c7dc44407865f04b8c74
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Sat Apr 23 20:35:09 2011 +0200
acpid: Update to version 2.0.9.
commit b7eab83e54695001a6f4512fbaf2d351725be1ef
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Apr 22 14:15:24 2011 +0200
gcc: Package libquadmath separately.
-----------------------------------------------------------------------
Summary of changes:
 pkgs/acpid/acpid.nm                                |    4 +-
 pkgs/clamav/clamav.nm                              |   10 +++-----
 pkgs/cpufrequtils/cpufrequtils.nm                  |   10 +++-----
 pkgs/gcc/gcc.nm                                    |   16 ++++++++++++-
 pkgs/lzo/lzo.nm                                    |    4 +-
 .../python-pyaspects.nm => pyserial/pyserial.nm}   |   22 +++++++++----------
 pkgs/telnet/telnet.nm                              |   19 ++++++++++++----
 7 files changed, 50 insertions(+), 35 deletions(-)
 copy pkgs/{python-pyaspects/python-pyaspects.nm => pyserial/pyserial.nm} (82%)
Difference in files:

diff --git a/pkgs/acpid/acpid.nm b/pkgs/acpid/acpid.nm
index 876aa25..07afd2d 100644
--- a/pkgs/acpid/acpid.nm
+++ b/pkgs/acpid/acpid.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
PKG_NAME       = acpid
-PKG_VER        = 2.0.8
-PKG_REL        = 2
+PKG_VER        = 2.0.9
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUPS     = Base System/Daemons
diff --git a/pkgs/clamav/clamav.nm b/pkgs/clamav/clamav.nm
index 980670d..edba0c3 100644
--- a/pkgs/clamav/clamav.nm
+++ b/pkgs/clamav/clamav.nm
@@ -54,9 +54,9 @@ PKG_PACKAGES  += $(PKG_NAME)-devel $(PKG_NAME)-libs
CFLAGS    += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLDAP_DEPRECATED
-CONFIGURE_ENVIRONMENT	+= have_cv_ipv6=yes
+CONFIGURE_ENVIRONMENT += have_cv_ipv6=yes
-CONFIGURE_OPTIONS	+= \
+CONFIGURE_OPTIONS += \
    --sysconfdir=/etc \
    --disable-static \
    --disable-rpath \
@@ -66,6 +66,8 @@ CONFIGURE_OPTIONS	+= \
    --with-user=clamupdate \
         --with-group=clamupdate
+# User and group have to exist to compile the source code, 
+# so we have to create them
 define STAGE_PREPARE_CMDS
    groupadd -g 497 -r clamupdate
    useradd	-u 497 -r -s /sbin/nologin -d /var/lib/clamav -M \
@@ -75,7 +77,3 @@ define STAGE_PREPARE_CMDS
    useradd -u 496 -r -s /sbin/nologin -d / -M \
    	-g clamscan clamscan 
 endef
-
-define STAGE_INSTALL
-	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
-endef
diff --git a/pkgs/cpufrequtils/cpufrequtils.nm b/pkgs/cpufrequtils/cpufrequtils.nm
index c2d2d59..a1aca68 100644
--- a/pkgs/cpufrequtils/cpufrequtils.nm
+++ b/pkgs/cpufrequtils/cpufrequtils.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = cpufrequtils
 PKG_VER        = 008
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER =
 PKG_GROUPS     = Base Applications/System
@@ -42,12 +42,10 @@ endef
PKG_TARBALL    = $(THISAPP).tar.gz
+# Package doesn't provide a configure script
 define STAGE_BUILD
-	cd $(DIR_APP) && make 
-endef
-
-define STAGE_INSTALL
-	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) mandir=/usr/share/man
+	cd $(DIR_APP) && make $(PARALELLISMFLAGS)
 endef
+STAGE_INSTALL_TARGETS = mandir=/usr/share/man
diff --git a/pkgs/gcc/gcc.nm b/pkgs/gcc/gcc.nm
index 5332ff5..22fd0d8 100644
--- a/pkgs/gcc/gcc.nm
+++ b/pkgs/gcc/gcc.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = gcc
 PKG_VER        = 4.6.0
-PKG_REL        = 2
+PKG_REL        = 3
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org
 PKG_GROUPS     = Development/Compilers
@@ -43,7 +43,7 @@ BINUTILS_VER = 2.21.51.0.8-1
PKG_BUILD_DEPS+= autogen binutils>=$(BINUTILS_VER) cloog-devel dejagnu \
    elfutils-devel expect flex gmp-devel libffi-devel mpc-devel mpfr-devel \
-	ppl-devel=0.10.2-0.ip3 texinfo zlib-devel
+	ppl-devel texinfo zlib-devel
 PKG_DEPS-gcc  += binutils>=$(BINUTILS_VER) libgcc-devel cloog>=0.15
# Make the GCC target platform
@@ -127,6 +127,7 @@ endef
 PKG_PACKAGES += libgomp-devel
 define PKG_FILES-libgomp-devel
    /usr/lib/libgomp*.so
+	/usr/lib/libgomp.spec
 endef
# libmudflap
@@ -140,6 +141,17 @@ define PKG_FILES-libmudflap-devel
    /usr/lib/libmudflap*.so
 endef
+# libquadmath
+PKG_PACKAGES += libquadmath
+define PKG_FILES-libquadmath
+	/usr/lib/libquadmath*.so.*
+endef
+
+PKG_PACKAGES += libquadmath-devel
+define PKG_FILES-libquadmath-devel
+	/usr/lib/libquadmath*.so
+endef
+
 define STAGE_PREPARE_CMDS
    -mkdir -v $(DIR_SRC)/gcc-build
diff --git a/pkgs/lzo/lzo.nm b/pkgs/lzo/lzo.nm
index c219755..7146224 100644
--- a/pkgs/lzo/lzo.nm
+++ b/pkgs/lzo/lzo.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
PKG_NAME       = lzo
-PKG_VER        = 2.04
-PKG_REL        = 0
+PKG_VER        = 2.05
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUPS     = Applications/Compression
diff --git a/pkgs/pyserial/pyserial.nm b/pkgs/pyserial/pyserial.nm
new file mode 100644
index 0000000..a6cd3dc
--- /dev/null
+++ b/pkgs/pyserial/pyserial.nm
@@ -0,0 +1,50 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 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/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME       = pyserial
+PKG_VER        = 2.5
+PKG_REL        = 1
+PKG_ARCH       = noarch
+
+PKG_MAINTAINER =
+PKG_GROUPS     = System/Libraries
+PKG_URL        = http://pyserial.sourceforge.net/
+PKG_LICENSE    = Python
+PKG_SUMMARY    = Python Serial Port Extension.
+
+PKG_BUILD_DEPS+= python-devel
+
+define PKG_DESCRIPTION
+	Python Serial Port Extension for Win32, Linux, BSD, Jython, IronPython.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.gz
+
+STAGE_BUILD = # Nothing to do
+
+define STAGE_INSTALL	
+	cd $(DIR_APP) && python setup.py install --root=$(BUILDROOT)
+endef
diff --git a/pkgs/telnet/telnet.nm b/pkgs/telnet/telnet.nm
index dfa7f0b..64d2e7a 100644
--- a/pkgs/telnet/telnet.nm
+++ b/pkgs/telnet/telnet.nm
@@ -24,9 +24,9 @@
include $(PKGROOT)/Include
-PKG_NAME       = netkit-telnet
+PKG_NAME       = telnet
 PKG_VER        = 0.17
-PKG_REL        = 1
+PKG_REL        = 2
PKG_MAINTAINER =
 PKG_GROUPS     = Applications/Internet
@@ -42,11 +42,17 @@ define PKG_DESCRIPTION
    logins into the host machine.
 endef
-PKG_TARBALL    = $(THISAPP).tar.gz
+PKG_TARBALL    = netkit-$(THISAPP).tar.gz
 PKG_OBJECTS   += telnet-client.tar.gz
-CONFIGURE_OPTIONS =
+DIR_APP = $(DIR_SRC)/netkit-$(THISAPP)
+# Overwite configure options, because configure script 
+# doesn't accept flags for used compiler or host definition
+CONFIGURE_OPTIONS = \
+	--prefix=/usr
+
+# Apply patches in a special order
 PKG_PATCHES    = telnet-client-cvs.patch0 \
    telnetd-0.17.patch0 \
    telnet-0.17-env.patch \
@@ -74,15 +80,18 @@ define STAGE_PREPARE
 endef
define STAGE_INSTALL
+	# We have to create the directories on our own
    -mkdir -pv $(BUILDROOT)/usr/man/man{1,5,8}
    -mkdir -pv $(BUILDROOT)/usr/{,s}bin
cd $(DIR_APP) && make install INSTALLROOT=$(BUILDROOT)
+	# Move manpages to correct place
    -mkdir -pv $(BUILDROOT)/usr/share
    mv $(BUILDROOT)/usr/man $(BUILDROOT)/usr/share/man
+
+	# Remove telnetd, we don't want it
    rm -rf $(BUILDROOT)/usr/sbin
    rm -rf $(BUILDROOT)/usr/share/man/man8
    rm -rf $(BUILDROOT)/usr/share/man/man5
-
 endef
hooks/post-receive
--
IPFire 3.x development tree

    