IPFire-SCM July 2010

ipfire-scm@lists.ipfire.org

1 participants
63 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f31f79566099b958c745af8fa584da897c24ec5b
by git＠ipfire.org 05 Jul '10

05 Jul '10

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 f31f79566099b958c745af8fa584da897c24ec5b (commit) via 1b04fe02141c5dc2eb5f88febca737bcd08a9f3d (commit) via c7eb78df09889e49e45f4659f0df27fd628a17f3 (commit) via 2b694eae9613fc930665a8a81c48dc76e54bb1be (commit) via bc2ce527c60676bb4412d621e9e14d95df4d60c5 (commit) via 02ae8415436374b7857614eda7d1a08593c3deb7 (commit) via fae487d3953fa05286cacbb380cf37bf2d22a8a9 (commit) via 2997fa1356d297705bbee0cebef2de476d814ae7 (commit) via 75579550ad6075e5dc5f2138a6737d53785af8e6 (commit) from a0466ef3c30fd3f09c76400d1268e66079855800 (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 f31f79566099b958c745af8fa584da897c24ec5b Merge: 2997fa1356d297705bbee0cebef2de476d814ae7 1b04fe02141c5dc2eb5f88febca737bcd08a9f3d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 2 21:05:48 2010 +0200 Merge remote branch 'stevee/updates' into next Conflicts: pkgs/core/pcre/pcre.nm commit 1b04fe02141c5dc2eb5f88febca737bcd08a9f3d Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Thu Jul 1 18:27:12 2010 +0200 pcre: Clean up Naoki-Makefile. commit c7eb78df09889e49e45f4659f0df27fd628a17f3 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Thu Jul 1 18:25:33 2010 +0200 pcre: Update to version 8.10. commit 2b694eae9613fc930665a8a81c48dc76e54bb1be Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Thu Jul 1 18:23:00 2010 +0200 cups: Update to version 1.4.4. commit bc2ce527c60676bb4412d621e9e14d95df4d60c5 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Thu Jul 1 15:44:41 2010 +0200 glib2: Update to version 2.25.10. commit 02ae8415436374b7857614eda7d1a08593c3deb7 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Thu Jul 1 15:38:31 2010 +0200 libpng: Also create a development package. commit fae487d3953fa05286cacbb380cf37bf2d22a8a9 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Thu Jul 1 15:36:07 2010 +0200 libpng: Update to version 1.4.3. commit 2997fa1356d297705bbee0cebef2de476d814ae7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 29 23:09:01 2010 +0200 pcre: Update to 8.10. commit 75579550ad6075e5dc5f2138a6737d53785af8e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 29 23:08:34 2010 +0200 libpng: Update to 1.4.3. Fixes a security vulnerability. ----------------------------------------------------------------------- Summary of changes: pkgs/core/cups/cups.nm | 2 +- pkgs/core/glib2/glib2.nm | 2 +- pkgs/core/libpng/libpng.nm | 6 ++++-- pkgs/core/pcre/pcre.nm | 13 ++++--------- 4 files changed, 10 insertions(+), 13 deletions(-) Difference in files: diff --git a/pkgs/core/cups/cups.nm b/pkgs/core/cups/cups.nm index 54c0b93..bc09112 100644 --- a/pkgs/core/cups/cups.nm +++ b/pkgs/core/cups/cups.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = cups -PKG_VER = 1.4.2 +PKG_VER = 1.4.4 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/core/glib2/glib2.nm index aa16d0a..c2ec625 100644 --- a/pkgs/core/glib2/glib2.nm +++ b/pkgs/core/glib2/glib2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = glib -PKG_VER = 2.25.6 +PKG_VER = 2.25.10 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/libpng/libpng.nm b/pkgs/core/libpng/libpng.nm index 42b17e2..4074318 100644 --- a/pkgs/core/libpng/libpng.nm +++ b/pkgs/core/libpng/libpng.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libpng -PKG_VER = 1.4.2 +PKG_VER = 1.4.3 PKG_REL = 0 PKG_MAINTAINER = @@ -37,6 +37,8 @@ PKG_SUMMARY = A library of functions for manipulating PNG image format files. PKG_BUILD_DEPS+= pkg-config PKG_DEPS += zlib +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + define PKG_DESCRIPTION The libpng package contains a library of functions for creating and \ manipulating PNG (Portable Network Graphics) image format files. \ @@ -45,4 +47,4 @@ define PKG_DESCRIPTION data compression algorithm. endef -PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/pcre/pcre.nm b/pkgs/core/pcre/pcre.nm index 4edc01d..416c73a 100644 --- a/pkgs/core/pcre/pcre.nm +++ b/pkgs/core/pcre/pcre.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = pcre -PKG_VER = 7.9 +PKG_VER = 8.10 PKG_REL = 0 PKG_MAINTAINER = @@ -44,19 +44,14 @@ endef PKG_TARBALL = $(THISAPP).tar.bz2 -CONFIGURE_OPTIONS += --docdir=/usr/share/doc/pcre-$(PKG_VER) \ +CONFIGURE_OPTIONS += \ + --docdir=/usr/share/doc/pcre-$(PKG_VER) \ --enable-utf8 \ --enable-pcregrep-libz \ --enable-pcregrep-libbz2 \ --enable-unicode-properties -############################################################################### -# Installation Details -############################################################################### - -define STAGE_INSTALL - cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) - +define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/{,usr/}lib mv -v $(BUILDROOT)/usr/lib/libpcre.so.* $(BUILDROOT)/lib/ ln -v -sf ../../lib/libpcre.so.0 $(BUILDROOT)/usr/lib/libpcre.so hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 608f644801bdf68b3de76142c51ff6dd85e9a911
by git＠ipfire.org 02 Jul '10

02 Jul '10

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 2.x development tree". The branch, master has been updated via 608f644801bdf68b3de76142c51ff6dd85e9a911 (commit) via 6d4a602f10a4abf0b97e9495d7f83ecc86146da8 (commit) via a075b9c5b1ed774a28a27e4ce41fc21ee683ae0d (commit) via aac6b746ce329ab2ad521cb62455dadfdda96665 (commit) from 18b98cafca11b61b8c462360ef36bb22674100bd (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 608f644801bdf68b3de76142c51ff6dd85e9a911 Merge: 18b98cafca11b61b8c462360ef36bb22674100bd 6d4a602f10a4abf0b97e9495d7f83ecc86146da8 Author: root <root(a)ipfire-build.rechtsabteilung> Date: Fri Jul 2 22:00:02 2010 +0200 Merge branch 'open-vm-tools' commit 6d4a602f10a4abf0b97e9495d7f83ecc86146da8 Author: root <root(a)ipfire-build.rechtsabteilung> Date: Fri Jul 2 21:52:44 2010 +0200 Added open-vm-tools package commit a075b9c5b1ed774a28a27e4ce41fc21ee683ae0d Author: root <root(a)ipfire-build.rechtsabteilung> Date: Fri Jul 2 21:49:49 2010 +0200 Changed make.sh to prepare open-vm-tools package commit aac6b746ce329ab2ad521cb62455dadfdda96665 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 27 11:32:28 2010 +0200 Update open-vm-tools. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/openvmtools | 39 ++++++++++++++++++++ doc/packages-list.txt | 2 +- lfs/{open-vm-tools => openvmtools} | 14 ++++++- make.sh | 2 +- src/initscripts/init.d/openvmtools | 64 +++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 config/rootfiles/packages/openvmtools rename lfs/{open-vm-tools => openvmtools} (90%) create mode 100755 src/initscripts/init.d/openvmtools Difference in files: diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools new file mode 100644 index 0000000..29f1177 --- /dev/null +++ b/config/rootfiles/packages/openvmtools @@ -0,0 +1,39 @@ +etc/rc.d/init.d/openvmtools +etc/rc.d/rc0.d/K01openvmtools +etc/rc.d/rc3.d/S60openvmtools +etc/rc.d/rc6.d/K01openvmtools +etc/vmware-tools +etc/vmware-tools/plugins +etc/vmware-tools/poweroff-vm-default +etc/vmware-tools/poweron-vm-default +etc/vmware-tools/resume-vm-default +etc/vmware-tools/suspend-vm-default +etc/vmware-tools/vm-support +sbin/mount.vmhgfs +usr/bin/vmtoolsd +usr/bin/vmware-checkvm +usr/bin/vmware-hgfsclient +usr/bin/vmware-rpctool +usr/bin/vmware-toolbox-cmd +usr/bin/vmware-vmblock-fuse +usr/bin/vmware-xferlogs +usr/lib/libguestlib.a +usr/lib/libguestlib.la +usr/lib/libguestlib.so +usr/lib/libguestlib.so.0 +usr/lib/libguestlib.so.0.0.0 +usr/lib/libvmtools.a +usr/lib/libvmtools.la +usr/lib/libvmtools.so +usr/lib/libvmtools.so.0 +usr/lib/libvmtools.so.0.0.0 +usr/lib/open-vm-tools +usr/lib/open-vm-tools/plugins +usr/lib/open-vm-tools/plugins/vmsvc +usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so +usr/lib/open-vm-tools/plugins/vmsvc/libhgfsServer.so +usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so +usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so +usr/lib/open-vm-tools/plugins/vmsvc/libvix.so +usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so +usr/sbin/mount.vmhgfs diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 91599d0..ee4aa73 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -257,7 +257,7 @@ * nut-2.4.3 * ocaml-3.09.2 * oinkmaster-2.0 -* open-vm-tools-2009.05.22-167859 +* open-vm-tools-8.4.2-261024 * openldap-2.3.20 * openmailadmin-1.0.0 * openssh-5.4p1 diff --git a/lfs/open-vm-tools b/lfs/open-vm-tools deleted file mode 100644 index 214193a..0000000 --- a/lfs/open-vm-tools +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 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 Config - -VER = 2009.05.22-167859 - -THISAPP = open-vm-tools-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = cc1c139d2d927952be93397d928f9d6c - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --with-kernel-release=$(KVER)-ipfire --without-pam \ - --disable-unity --without-gtk2 --without-gtkmm \ - --without-procps --without-dnet --without-icu \ - --without-x --with-linuxdir=/usr/src/linux \ - --without-kernel-modules - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/openvmtools b/lfs/openvmtools new file mode 100644 index 0000000..c708268 --- /dev/null +++ b/lfs/openvmtools @@ -0,0 +1,92 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 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 Config + +VER = 8.4.2-261024 + +THISAPP = open-vm-tools-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = openvmtools +PAK_VER = 0 +DEPS = "glib" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 4d9ddc865b42fc6982c3078031500486 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-kernel-release=$(KVER)-ipfire --without-pam \ + --disable-unity --without-gtk2 --without-gtkmm \ + --without-procps --without-dnet --without-icu \ + --without-x --with-linuxdir=/usr/src/linux \ + --without-kernel-modules + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools + ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools + ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools + rm -rvf /usr/etc/pam.d /usr/share/openvmtools + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index eb63bb4..574f9f2 100755 --- a/make.sh +++ b/make.sh @@ -625,7 +625,7 @@ buildipfire() { ipfiremake perl-DBD-mysql ipfiremake cacti ipfiremake icecc - ipfiremake open-vm-tools + ipfiremake openvmtools ipfiremake nagiosql ipfiremake iftop ipfiremake motion diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools new file mode 100755 index 0000000..c1588e1 --- /dev/null +++ b/src/initscripts/init.d/openvmtools @@ -0,0 +1,64 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/ +# +# Description : init-script for open-vm-tools +# +# Authors : earl +# +# Version : 00.01 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null + then + boot_mesg "vmtoolsd is running..." + echo_warning + else + if /usr/bin/vmware-checkvm > /dev/null 2>&1; then + boot_mesg "Starting..." + /usr/bin/vmtoolsd & + echo_ok + else + boot_mesg "IPFire is not running in a virtual machine." + echo_failure + fi + fi + ;; + + stop) + if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null + then + boot_mesg "Stopping..." + killall /usr/bin/vmtoolsd > /dev/null + echo_ok + else + boot_mesg "vmtoolsd is not running..." + echo_warning + fi + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/bin/vmtoolsd + ;; + + *) + echo "Usage: ${0} {start|stop|restart}" + exit 1 + ;; +esac + +# End $rc_base/init.d/ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 18b98cafca11b61b8c462360ef36bb22674100bd
by git＠ipfire.org 01 Jul '10

01 Jul '10

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 2.x development tree". The branch, master has been updated via 18b98cafca11b61b8c462360ef36bb22674100bd (commit) from a426dda87652bf71603f9028550346f17c0d17a8 (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 18b98cafca11b61b8c462360ef36bb22674100bd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 1 23:32:44 2010 +0200 Updated ipfireseeder (IPFire 2.7 core38). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- doc/packages-list.txt | 2 ++ lfs/ipfireseeder | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 5a0ce0d..f38ed4e 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.5.i586-full-core37.iso.torrent +var/ipfire/seeder/ipfire-2.7.i586-full-core38.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/doc/packages-list.txt b/doc/packages-list.txt index acde829..91599d0 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -185,6 +185,7 @@ * liboping-1.3.4 * libpcap-1.0.0 * libpng-1.2.12 +* libpng-1.2.44 * libpri-1.4.10.2 * libsafe_2.0-16 * libshout-2.2.2 @@ -333,6 +334,7 @@ * texinfo-4.8 * tftp-hpa-0.48 * tiff-3.8.2 +* tiff-3.9.4 * traceroute-2.0.12 * tripwire-2.4.1.2 * tunctl diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 8c75848..4477762 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.5.i586-full-core37.iso.torrent +DL_FILE = ipfire-2.7.i586-full-core38.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 11 +PAK_VER = 12 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2f984c777a487f5f7642f3abbe6aee31 +$(DL_FILE)_MD5 = 0848aee5e93b9716ce70f6dcdf2f5863 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2010