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 70e0de8a9270a556435ea5af9aedfed0db853ff4 (commit) via d66c8c347f81f0a2ac2dd0bad6b516eae3fbfeff (commit) via ae8973e6cf710baea98c76f1e8c96cefc0195b34 (commit) from 70f438159dcff578f59b90e48b17f69980445051 (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 70e0de8a9270a556435ea5af9aedfed0db853ff4 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 19 14:36:00 2010 +0200

libjpeg: Replace libjpeg by libjpeg-turbo.

libjpeg-turbo will be much faster than the older one.

commit d66c8c347f81f0a2ac2dd0bad6b516eae3fbfeff Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 18 23:09:24 2010 +0200

network: Remove udev rule that renames devices.

commit ae8973e6cf710baea98c76f1e8c96cefc0195b34 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 18 23:06:45 2010 +0200

network: Logging changes on ip-updown.

pppd will not be able to print any error messages so we use assert which will dump a possible error to the log file.

-----------------------------------------------------------------------

Summary of changes: pkgs/core/libjpeg/libjpeg.nm | 38 ++++++++++++++++++++++++---------- pkgs/core/network/60-network.rules | 1 - pkgs/core/network/network.nm | 4 +-- pkgs/core/network/src/ppp/ip-updown | 14 +----------- 4 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 pkgs/core/network/60-network.rules

Difference in files: diff --git a/pkgs/core/libjpeg/libjpeg.nm b/pkgs/core/libjpeg/libjpeg.nm index 2c2e3d5..8fe32d2 100644 --- a/pkgs/core/libjpeg/libjpeg.nm +++ b/pkgs/core/libjpeg/libjpeg.nm @@ -24,25 +24,41 @@

include $(PKGROOT)/Include

-PKG_NAME = libjpeg -PKG_VER = 8a +PKG_NAME = libjpeg-turbo +PKG_VER = 1.0.0 PKG_REL = 0

PKG_MAINTAINER = PKG_GROUP = System/Libraries -PKG_URL = http://www.ijg.org -PKG_LICENSE = IJG -PKG_SUMMARY = A library for manipulating JPEG image format files. +PKG_URL = http://sourceforge.net/projects/libjpeg-turbo +PKG_LICENSE = wxWidgets +PKG_SUMMARY = A MMX/SSE2 accelerated library for manipulating JPEG image files. + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +PKG_BUILD_DEPS+= autoconf automake libtool nasm

define PKG_DESCRIPTION - The libjpeg package contains a library of functions for manipulating \ - JPEG images, as well as simple client programs for accessing the \ - libjpeg functions. + The libjpeg-turbo-utils package contains simple client programs for \ + accessing the libjpeg functions. It contains cjpeg, djpeg, jpegtran,\ + rdjpgcom and wrjpgcom. Cjpeg compresses an image file into JPEG format. \ + Djpeg decompresses a JPEG file into a regular image file. Jpegtran \ + can perform various useful transformations on JPEG files. Rdjpgcom \ + displays any text comments included in a JPEG file. Wrjpgcom inserts \ + text comments into a JPEG file. endef

-PKG_TARBALL = jpegsrc.v$(PKG_VER).tar.gz - -DIR_APP = /usr/src/jpeg-$(PKG_VER) +PKG_TARBALL = $(PKG_NAME)-$(PKG_VER).tar.gz

CONFIGURE_OPTIONS += \ --enable-shared + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && autoreconf -vfi +endef + +define STAGE_INSTALL_CMDS + # Remove non-versioned libjpegturbo. + rm -vf $(BUILDROOT)/usr/include/turbojpeg.h + rm -vf $(BUILDROOT)/usr/lib/libturbojpeg.so +endef diff --git a/pkgs/core/network/60-network.rules b/pkgs/core/network/60-network.rules deleted file mode 100644 index 39bf4cd..0000000 --- a/pkgs/core/network/60-network.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="eth*", NAME="port%n" diff --git a/pkgs/core/network/network.nm b/pkgs/core/network/network.nm index cd2aacc..25b6c89 100644 --- a/pkgs/core/network/network.nm +++ b/pkgs/core/network/network.nm @@ -50,7 +50,7 @@ STAGE_BUILD = # Do nothing

define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/etc/{network,ppp} - -mkdir -pv $(BUILDROOT)/lib/{network,udev/rules.d} + -mkdir -pv $(BUILDROOT)/lib/network -mkdir -pv $(BUILDROOT)/sbin -mkdir -pv $(BUILDROOT)/var/log/network

@@ -62,6 +62,4 @@ define STAGE_INSTALL ln -svf ip-updown $(BUILDROOT)/etc/ppp/ip-pre-up ln -svf ip-updown $(BUILDROOT)/etc/ppp/ip-up ln -svf ip-updown $(BUILDROOT)/etc/ppp/ip-down - - cp -vf $(DIR_SOURCE)/60-network.rules $(BUILDROOT)/lib/udev/rules.d/ endef diff --git a/pkgs/core/network/src/ppp/ip-updown b/pkgs/core/network/src/ppp/ip-updown index cc746a1..8e9751a 100755 --- a/pkgs/core/network/src/ppp/ip-updown +++ b/pkgs/core/network/src/ppp/ip-updown @@ -22,8 +22,6 @@ umask 022 export PATH=/usr/sbin:/sbin:/usr/bin:/bin

-exec &>/tmp/network.$(basename $0) - # Give the variables we get passed by pppd an own namespace for i in IFNAME IPLOCAL IPREMOTE DNS1 DNS2 MACREMOTE; do export PPP_${i}=${!i} @@ -36,19 +34,11 @@ done ZONE=${PPP_IFNAME}

assert isset ZONE - -if ! zone_exists ${ZONE}; then - error "Zone '${ZONE}' does not exist." - exit ${EXIT_ERROR} -fi +assert zone_exists ${ZONE}

HOOK=$(zone_get_hook ${ZONE})

assert isset HOOK - -if ! hook_zone_exists ${HOOK}; then - error "Hook '${HOOK}' does not exist." - exit ${EXIT_ERROR} -fi +assert hook_zone_exists ${HOOK}

hook_zone_exec ${HOOK} ppp-$(basename ${0}) ${ZONE}

hooks/post-receive -- IPFire 3.x development tree