From: Arne Fitzenreiter Date: Fri, 2 Apr 2010 22:19:44 +0000 (+0200) Subject: Merge branch 'next' X-Git-Tag: v2.9-beta1~412 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0a8db55873838c67f045d4124f566451019622a8;hp=-c Merge branch 'next' Conflicts: config/rootfiles/core/37/filelists/files config/rootfiles/packages/gutenprint doc/packages-list.txt src/pakfire/lib/functions.sh --- 0a8db55873838c67f045d4124f566451019622a8 diff --combined config/rootfiles/oldcore/37/update.sh index 67cd0c025e,e78621e343..67cd0c025e --- a/config/rootfiles/oldcore/37/update.sh +++ b/config/rootfiles/oldcore/37/update.sh @@@ -25,32 -25,21 +25,32 @@@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # #Stop services - +/etc/init.d/squid stop # #Extract files extract_files # #Start services - +/etc/init.d/squid start +/etc/init.d/apache restart +# # #Delete sensors config to force new scan rm -f /etc/sysconfig/lm_sensors +#Create cyrus-sasl autostart links +ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl +ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl +ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl + # #Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +#Fix permissions of update booster +chown -R nobody:nobody /var/ipfire/updatexlrator + # #Run depmod to rebuld module informations depmod 2.6.27.42-ipfire diff --combined config/rootfiles/packages/gutenprint index 6ebaae5d5b,e134882d2a..a65efb46ee --- a/config/rootfiles/packages/gutenprint +++ b/config/rootfiles/packages/gutenprint @@@ -249,13 -249,13 +249,13 @@@ usr/share/foomatic/db/source/opt/gutenp usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_yellowgamma-1.xml usr/share/foomatic/kitload.log #usr/share/gutenprint - usr/share/gutenprint/5.2 - usr/share/gutenprint/5.2/xml + #usr/share/gutenprint/5.2 + #usr/share/gutenprint/5.2/xml usr/share/gutenprint/5.2/xml/dither-matrix-1x1.xml usr/share/gutenprint/5.2/xml/dither-matrix-2x1.xml usr/share/gutenprint/5.2/xml/dither-matrix-4x1.xml - usr/share/gutenprint/5.2/xml/escp2 - usr/share/gutenprint/5.2/xml/escp2/inks + #usr/share/gutenprint/5.2/xml/escp2 + #usr/share/gutenprint/5.2/xml/escp2/inks usr/share/gutenprint/5.2/xml/escp2/inks/artisan.xml usr/share/gutenprint/5.2/xml/escp2/inks/b500.xml usr/share/gutenprint/5.2/xml/escp2/inks/c120.xml @@@ -295,7 -295,7 +295,7 @@@ usr/share/gutenprint/5.2/xml/escp2/inks usr/share/gutenprint/5.2/xml/escp2/inks/wf40.xml usr/share/gutenprint/5.2/xml/escp2/inks/wf500.xml usr/share/gutenprint/5.2/xml/escp2/inks/x80.xml - usr/share/gutenprint/5.2/xml/escp2/inputslots + #usr/share/gutenprint/5.2/xml/escp2/inputslots usr/share/gutenprint/5.2/xml/escp2/inputslots/artisan.xml usr/share/gutenprint/5.2/xml/escp2/inputslots/b500.xml usr/share/gutenprint/5.2/xml/escp2/inputslots/cd.xml @@@ -311,7 -311,7 +311,7 @@@ usr/share/gutenprint/5.2/xml/escp2/inpu usr/share/gutenprint/5.2/xml/escp2/inputslots/rx700.xml usr/share/gutenprint/5.2/xml/escp2/inputslots/spro5000.xml usr/share/gutenprint/5.2/xml/escp2/inputslots/standard_roll_feed.xml - usr/share/gutenprint/5.2/xml/escp2/media + #usr/share/gutenprint/5.2/xml/escp2/media usr/share/gutenprint/5.2/xml/escp2/media/artisan.xml usr/share/gutenprint/5.2/xml/escp2/media/b500.xml usr/share/gutenprint/5.2/xml/escp2/media/c120.xml @@@ -351,9 -351,9 +351,9 @@@ usr/share/gutenprint/5.2/xml/escp2/medi usr/share/gutenprint/5.2/xml/escp2/media/ultrachrome.xml usr/share/gutenprint/5.2/xml/escp2/media/wf500.xml usr/share/gutenprint/5.2/xml/escp2/media/x80.xml - usr/share/gutenprint/5.2/xml/escp2/mediasizes + #usr/share/gutenprint/5.2/xml/escp2/mediasizes usr/share/gutenprint/5.2/xml/escp2/mediasizes/standard.xml - usr/share/gutenprint/5.2/xml/escp2/model + #usr/share/gutenprint/5.2/xml/escp2/model usr/share/gutenprint/5.2/xml/escp2/model/model_0.xml usr/share/gutenprint/5.2/xml/escp2/model/model_1.xml usr/share/gutenprint/5.2/xml/escp2/model/model_10.xml @@@ -455,13 -455,13 +455,13 @@@ usr/share/gutenprint/5.2/xml/escp2/mode usr/share/gutenprint/5.2/xml/escp2/model/model_97.xml usr/share/gutenprint/5.2/xml/escp2/model/model_98.xml usr/share/gutenprint/5.2/xml/escp2/model/model_99.xml - usr/share/gutenprint/5.2/xml/escp2/qualitypresets + #usr/share/gutenprint/5.2/xml/escp2/qualitypresets usr/share/gutenprint/5.2/xml/escp2/qualitypresets/p1_5.xml usr/share/gutenprint/5.2/xml/escp2/qualitypresets/picturemate.xml usr/share/gutenprint/5.2/xml/escp2/qualitypresets/standard.xml usr/share/gutenprint/5.2/xml/escp2/qualitypresets/v2880.xml usr/share/gutenprint/5.2/xml/escp2/qualitypresets/wf40.xml - usr/share/gutenprint/5.2/xml/escp2/weaves + #usr/share/gutenprint/5.2/xml/escp2/weaves usr/share/gutenprint/5.2/xml/escp2/weaves/pro7000.xml usr/share/gutenprint/5.2/xml/escp2/weaves/pro7500.xml usr/share/gutenprint/5.2/xml/escp2/weaves/pro7600.xml @@@ -512,12 -512,12 +512,12 @@@ usr/share/locale/de/LC_MESSAGES/gutenpr usr/share/locale/de/gutenprint_de.po #usr/share/locale/el/LC_MESSAGES/gutenprint.mo #usr/share/locale/el/gutenprint_el.po - usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo - usr/share/locale/en_GB/gutenprint_en_GB.po - usr/share/locale/es/LC_MESSAGES/gutenprint.mo - usr/share/locale/es/gutenprint_es.po - usr/share/locale/fr/LC_MESSAGES/gutenprint.mo - usr/share/locale/fr/gutenprint_fr.po + #usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo + #usr/share/locale/en_GB/gutenprint_en_GB.po + #usr/share/locale/es/LC_MESSAGES/gutenprint.mo + #usr/share/locale/es/gutenprint_es.po + #usr/share/locale/fr/LC_MESSAGES/gutenprint.mo + #usr/share/locale/fr/gutenprint_fr.po #usr/share/locale/hu/LC_MESSAGES/gutenprint.mo #usr/share/locale/hu/gutenprint_hu.po #usr/share/locale/it/LC_MESSAGES/gutenprint.mo @@@ -532,8 -532,8 +532,8 @@@ #usr/share/locale/pl/gutenprint_pl.po #usr/share/locale/pt/LC_MESSAGES/gutenprint.mo #usr/share/locale/pt/gutenprint_pt.po - usr/share/locale/ru/LC_MESSAGES/gutenprint.mo - usr/share/locale/ru/gutenprint_ru.po + #usr/share/locale/ru/LC_MESSAGES/gutenprint.mo + #usr/share/locale/ru/gutenprint_ru.po #usr/share/locale/sk/LC_MESSAGES/gutenprint.mo #usr/share/locale/sk/gutenprint_sk.po #usr/share/locale/sv/LC_MESSAGES/gutenprint.mo @@@ -544,4 -544,4 +544,4 @@@ #usr/share/man/man8/cups-calibrate.8 #usr/share/man/man8/cups-genppd.8 #usr/share/man/man8/cups-genppdupdate.8 -var/ipfire/cups/command.types +var/ipfire/cups/command.types diff --combined make.sh index 40a9e4b02e,7121005e77..9c7369c742 --- a/make.sh +++ b/make.sh @@@ -24,9 -24,9 +24,9 @@@ NAME="IPFire" # Software name SNAME="ipfire" # Short name - VERSION="2.5" # Version number - CORE="37" # Core Level (Filename) + VERSION="2.6" # Version number -CORE="37" # Core Level (Filename) -PAKFIRE_CORE="36" # Core Level (PAKFIRE) ++CORE="38" # Core Level (Filename) +PAKFIRE_CORE="37" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@@ -36,7 -36,7 +36,7 @@@ KVER=`grep --max-count=1 VER lfs/linux MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit - TOOLCHAINVER=1 + TOOLCHAINVER=2 IPFVER="full" # Which versions should be compiled? (full|devel) # Debian specific settings @@@ -340,42 -340,30 +340,30 @@@ buildipfire() ipfiremake pptp ipfiremake unzip ipfiremake which + ipfiremake xz + ipfiremake linux-firmware ipfiremake linux XEN=1 - ipfiremake atl1c XEN=1 - ipfiremake atl2 XEN=1 - ipfiremake hso XEN=1 - ipfiremake e1000e XEN=1 - ipfiremake et131x XEN=1 - ipfiremake r8101 XEN=1 - ipfiremake r8169 XEN=1 - ipfiremake r8168 XEN=1 ipfiremake kqemu XEN=1 #ipfiremake kvm-kmod XEN=1 ipfiremake v4l-dvb XEN=1 ipfiremake madwifi XEN=1 #ipfiremake alsa XEN=1 KMOD=1 ipfiremake dahdi XEN=1 KMOD=1 - ipfiremake openswan XEN=1 KMOD=1 - ipfiremake mISDN XEN=1 - ipfiremake compat-wireless XEN=1 + # ipfiremake openswan XEN=1 KMOD=1 + #ipfiremake mISDN XEN=1 + #ipfiremake compat-wireless XEN=1 + ipfiremake cryptodev XEN=1 ipfiremake linux - ipfiremake atl1c - ipfiremake atl2 - ipfiremake hso - ipfiremake e1000e - ipfiremake et131x - ipfiremake r8101 - ipfiremake r8169 - ipfiremake r8168 ipfiremake kqemu - ipfiremake kvm-kmod + #ipfiremake kvm-kmod ipfiremake v4l-dvb ipfiremake madwifi ipfiremake alsa KMOD=1 ipfiremake dahdi KMOD=1 - ipfiremake openswan KMOD=1 - ipfiremake mISDN - ipfiremake compat-wireless + # ipfiremake openswan KMOD=1 + #ipfiremake mISDN + #ipfiremake compat-wireless + ipfiremake cryptodev ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio @@@ -559,12 -547,14 +547,14 @@@ ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd - ipfiremake openswan + # ipfiremake openswan + ipfiremake strongswan ipfiremake lsof ipfiremake centerim ipfiremake br2684ctl ipfiremake pcmciautils ipfiremake lm_sensors + ipfiremake liboping ipfiremake collectd ipfiremake lcd4linux ipfiremake tcptrack @@@ -658,7 -648,7 +648,7 @@@ echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine - if [ "$GIT_BRANCH" = "master" ]; then + if [ "$GIT_BRANCH" = "next" ]; then echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release else echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release