diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211 index 3339ea8fd..9e04ea671 100644 --- a/config/etc/modprobe.d/cfg80211 +++ b/config/etc/modprobe.d/cfg80211 @@ -1,2 +1,2 @@ -options cfg80211 ieee80211_regdom=EU +#options cfg80211 ieee80211_regdom=DE blacklist ieee80211 diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 58bbf8c6a..9393aec50 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -110,6 +110,7 @@ etc/rc.d/init.d/snort etc/rc.d/init.d/squid etc/rc.d/init.d/sshd #etc/rc.d/init.d/sslh +etc/rc.d/init.d/static-routes etc/rc.d/init.d/swap etc/rc.d/init.d/sysctl etc/rc.d/init.d/sysklogd diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 6e97b170f..c7d4bbd45 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -10,21 +10,21 @@ etc/ipsec.d/private etc/ipsec.d/reqs etc/ipsec.secrets etc/strongswan.conf -#usr/lib/libcharon.a -#usr/lib/libcharon.la -usr/lib/libcharon.so -usr/lib/libcharon.so.0 -usr/lib/libcharon.so.0.0.0 -#usr/lib/libhydra.a -#usr/lib/libhydra.la -usr/lib/libhydra.so -usr/lib/libhydra.so.0 -usr/lib/libhydra.so.0.0.0 -#usr/lib/libstrongswan.a -#usr/lib/libstrongswan.la -usr/lib/libstrongswan.so -usr/lib/libstrongswan.so.0 -usr/lib/libstrongswan.so.0.0.0 +#usr/lib/ipsec/libcharon.a +#usr/lib/ipsec/libcharon.la +usr/lib/ipsec/libcharon.so +usr/lib/ipsec/libcharon.so.0 +usr/lib/ipsec/libcharon.so.0.0.0 +#usr/lib/ipsec/libhydra.a +#usr/lib/ipsec/libhydra.la +usr/lib/ipsec/libhydra.so +usr/lib/ipsec/libhydra.so.0 +usr/lib/ipsec/libhydra.so.0.0.0 +#usr/lib/ipsec/libstrongswan.a +#usr/lib/ipsec/libstrongswan.la +usr/lib/ipsec/libstrongswan.so +usr/lib/ipsec/libstrongswan.so.0 +usr/lib/ipsec/libstrongswan.so.0.0.0 #usr/libexec/ipsec usr/libexec/ipsec/_copyright usr/libexec/ipsec/_pluto_adns @@ -33,85 +33,86 @@ usr/libexec/ipsec/_updown_espmark usr/libexec/ipsec/charon usr/libexec/ipsec/openac usr/libexec/ipsec/pki -#usr/libexec/ipsec/plugins -#usr/libexec/ipsec/plugins/libstrongswan-aes.a -#usr/libexec/ipsec/plugins/libstrongswan-aes.la -usr/libexec/ipsec/plugins/libstrongswan-aes.so -#usr/libexec/ipsec/plugins/libstrongswan-attr.a -#usr/libexec/ipsec/plugins/libstrongswan-attr.la -usr/libexec/ipsec/plugins/libstrongswan-attr.so -#usr/libexec/ipsec/plugins/libstrongswan-constraints.a -#usr/libexec/ipsec/plugins/libstrongswan-constraints.la -usr/libexec/ipsec/plugins/libstrongswan-constraints.so -#usr/libexec/ipsec/plugins/libstrongswan-curl.a -#usr/libexec/ipsec/plugins/libstrongswan-curl.la -usr/libexec/ipsec/plugins/libstrongswan-curl.so -#usr/libexec/ipsec/plugins/libstrongswan-des.a -#usr/libexec/ipsec/plugins/libstrongswan-des.la -usr/libexec/ipsec/plugins/libstrongswan-des.so -#usr/libexec/ipsec/plugins/libstrongswan-dnskey.a -#usr/libexec/ipsec/plugins/libstrongswan-dnskey.la -usr/libexec/ipsec/plugins/libstrongswan-dnskey.so -#usr/libexec/ipsec/plugins/libstrongswan-fips-prf.a -#usr/libexec/ipsec/plugins/libstrongswan-fips-prf.la -usr/libexec/ipsec/plugins/libstrongswan-fips-prf.so -#usr/libexec/ipsec/plugins/libstrongswan-gmp.a -#usr/libexec/ipsec/plugins/libstrongswan-gmp.la -usr/libexec/ipsec/plugins/libstrongswan-gmp.so -#usr/libexec/ipsec/plugins/libstrongswan-hmac.a -#usr/libexec/ipsec/plugins/libstrongswan-hmac.la -usr/libexec/ipsec/plugins/libstrongswan-hmac.so -#usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.a -#usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.la -usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.so -#usr/libexec/ipsec/plugins/libstrongswan-md5.a -#usr/libexec/ipsec/plugins/libstrongswan-md5.la -usr/libexec/ipsec/plugins/libstrongswan-md5.so -#usr/libexec/ipsec/plugins/libstrongswan-pem.a -#usr/libexec/ipsec/plugins/libstrongswan-pem.la -usr/libexec/ipsec/plugins/libstrongswan-pem.so -#usr/libexec/ipsec/plugins/libstrongswan-pgp.a -#usr/libexec/ipsec/plugins/libstrongswan-pgp.la -usr/libexec/ipsec/plugins/libstrongswan-pgp.so -#usr/libexec/ipsec/plugins/libstrongswan-pkcs1.a -#usr/libexec/ipsec/plugins/libstrongswan-pkcs1.la -usr/libexec/ipsec/plugins/libstrongswan-pkcs1.so -#usr/libexec/ipsec/plugins/libstrongswan-pubkey.a -#usr/libexec/ipsec/plugins/libstrongswan-pubkey.la -usr/libexec/ipsec/plugins/libstrongswan-pubkey.so -#usr/libexec/ipsec/plugins/libstrongswan-random.a -#usr/libexec/ipsec/plugins/libstrongswan-random.la -usr/libexec/ipsec/plugins/libstrongswan-random.so -#usr/libexec/ipsec/plugins/libstrongswan-resolve.a -#usr/libexec/ipsec/plugins/libstrongswan-resolve.la -usr/libexec/ipsec/plugins/libstrongswan-resolve.so -#usr/libexec/ipsec/plugins/libstrongswan-revocation.a -#usr/libexec/ipsec/plugins/libstrongswan-revocation.la -usr/libexec/ipsec/plugins/libstrongswan-revocation.so -#usr/libexec/ipsec/plugins/libstrongswan-sha1.a -#usr/libexec/ipsec/plugins/libstrongswan-sha1.la -usr/libexec/ipsec/plugins/libstrongswan-sha1.so -#usr/libexec/ipsec/plugins/libstrongswan-sha2.a -#usr/libexec/ipsec/plugins/libstrongswan-sha2.la -usr/libexec/ipsec/plugins/libstrongswan-sha2.so -#usr/libexec/ipsec/plugins/libstrongswan-socket-raw.a -#usr/libexec/ipsec/plugins/libstrongswan-socket-raw.la -usr/libexec/ipsec/plugins/libstrongswan-socket-raw.so -#usr/libexec/ipsec/plugins/libstrongswan-stroke.a -#usr/libexec/ipsec/plugins/libstrongswan-stroke.la -usr/libexec/ipsec/plugins/libstrongswan-stroke.so -#usr/libexec/ipsec/plugins/libstrongswan-updown.a -#usr/libexec/ipsec/plugins/libstrongswan-updown.la -usr/libexec/ipsec/plugins/libstrongswan-updown.so -#usr/libexec/ipsec/plugins/libstrongswan-x509.a -#usr/libexec/ipsec/plugins/libstrongswan-x509.la -usr/libexec/ipsec/plugins/libstrongswan-x509.so -#usr/libexec/ipsec/plugins/libstrongswan-xauth.a -#usr/libexec/ipsec/plugins/libstrongswan-xauth.la -usr/libexec/ipsec/plugins/libstrongswan-xauth.so -#usr/libexec/ipsec/plugins/libstrongswan-xcbc.a -#usr/libexec/ipsec/plugins/libstrongswan-xcbc.la -usr/libexec/ipsec/plugins/libstrongswan-xcbc.so +#usr/lib/ipsec +#usr/lib/ipsec/plugins +#usr/lib/ipsec/plugins/libstrongswan-aes.a +#usr/lib/ipsec/plugins/libstrongswan-aes.la +usr/lib/ipsec/plugins/libstrongswan-aes.so +#usr/lib/ipsec/plugins/libstrongswan-attr.a +#usr/lib/ipsec/plugins/libstrongswan-attr.la +usr/lib/ipsec/plugins/libstrongswan-attr.so +#usr/lib/ipsec/plugins/libstrongswan-constraints.a +#usr/lib/ipsec/plugins/libstrongswan-constraints.la +usr/lib/ipsec/plugins/libstrongswan-constraints.so +#usr/lib/ipsec/plugins/libstrongswan-curl.a +#usr/lib/ipsec/plugins/libstrongswan-curl.la +usr/lib/ipsec/plugins/libstrongswan-curl.so +#usr/lib/ipsec/plugins/libstrongswan-des.a +#usr/lib/ipsec/plugins/libstrongswan-des.la +usr/lib/ipsec/plugins/libstrongswan-des.so +#usr/lib/ipsec/plugins/libstrongswan-dnskey.a +#usr/lib/ipsec/plugins/libstrongswan-dnskey.la +usr/lib/ipsec/plugins/libstrongswan-dnskey.so +#usr/lib/ipsec/plugins/libstrongswan-fips-prf.a +#usr/lib/ipsec/plugins/libstrongswan-fips-prf.la +usr/lib/ipsec/plugins/libstrongswan-fips-prf.so +#usr/lib/ipsec/plugins/libstrongswan-gmp.a +#usr/lib/ipsec/plugins/libstrongswan-gmp.la +usr/lib/ipsec/plugins/libstrongswan-gmp.so +#usr/lib/ipsec/plugins/libstrongswan-hmac.a +#usr/lib/ipsec/plugins/libstrongswan-hmac.la +usr/lib/ipsec/plugins/libstrongswan-hmac.so +#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.a +#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.la +usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so +#usr/lib/ipsec/plugins/libstrongswan-md5.a +#usr/lib/ipsec/plugins/libstrongswan-md5.la +usr/lib/ipsec/plugins/libstrongswan-md5.so +#usr/lib/ipsec/plugins/libstrongswan-pem.a +#usr/lib/ipsec/plugins/libstrongswan-pem.la +usr/lib/ipsec/plugins/libstrongswan-pem.so +#usr/lib/ipsec/plugins/libstrongswan-pgp.a +#usr/lib/ipsec/plugins/libstrongswan-pgp.la +usr/lib/ipsec/plugins/libstrongswan-pgp.so +#usr/lib/ipsec/plugins/libstrongswan-pkcs1.a +#usr/lib/ipsec/plugins/libstrongswan-pkcs1.la +usr/lib/ipsec/plugins/libstrongswan-pkcs1.so +#usr/lib/ipsec/plugins/libstrongswan-pubkey.a +#usr/lib/ipsec/plugins/libstrongswan-pubkey.la +usr/lib/ipsec/plugins/libstrongswan-pubkey.so +#usr/lib/ipsec/plugins/libstrongswan-random.a +#usr/lib/ipsec/plugins/libstrongswan-random.la +usr/lib/ipsec/plugins/libstrongswan-random.so +#usr/lib/ipsec/plugins/libstrongswan-resolve.a +#usr/lib/ipsec/plugins/libstrongswan-resolve.la +usr/lib/ipsec/plugins/libstrongswan-resolve.so +#usr/lib/ipsec/plugins/libstrongswan-revocation.a +#usr/lib/ipsec/plugins/libstrongswan-revocation.la +usr/lib/ipsec/plugins/libstrongswan-revocation.so +#usr/lib/ipsec/plugins/libstrongswan-sha1.a +#usr/lib/ipsec/plugins/libstrongswan-sha1.la +usr/lib/ipsec/plugins/libstrongswan-sha1.so +#usr/lib/ipsec/plugins/libstrongswan-sha2.a +#usr/lib/ipsec/plugins/libstrongswan-sha2.la +usr/lib/ipsec/plugins/libstrongswan-sha2.so +#usr/lib/ipsec/plugins/libstrongswan-socket-raw.a +#usr/lib/ipsec/plugins/libstrongswan-socket-raw.la +usr/lib/ipsec/plugins/libstrongswan-socket-raw.so +#usr/lib/ipsec/plugins/libstrongswan-stroke.a +#usr/lib/ipsec/plugins/libstrongswan-stroke.la +usr/lib/ipsec/plugins/libstrongswan-stroke.so +#usr/lib/ipsec/plugins/libstrongswan-updown.a +#usr/lib/ipsec/plugins/libstrongswan-updown.la +usr/lib/ipsec/plugins/libstrongswan-updown.so +#usr/lib/ipsec/plugins/libstrongswan-x509.a +#usr/lib/ipsec/plugins/libstrongswan-x509.la +usr/lib/ipsec/plugins/libstrongswan-x509.so +#usr/lib/ipsec/plugins/libstrongswan-xauth.a +#usr/lib/ipsec/plugins/libstrongswan-xauth.la +usr/lib/ipsec/plugins/libstrongswan-xauth.so +#usr/lib/ipsec/plugins/libstrongswan-xcbc.a +#usr/lib/ipsec/plugins/libstrongswan-xcbc.la +usr/lib/ipsec/plugins/libstrongswan-xcbc.so usr/libexec/ipsec/pluto usr/libexec/ipsec/scepclient usr/libexec/ipsec/starter diff --git a/config/rootfiles/core/next/filelists/crda b/config/rootfiles/core/next/filelists/crda deleted file mode 120000 index d68c46e55..000000000 --- a/config/rootfiles/core/next/filelists/crda +++ /dev/null @@ -1 +0,0 @@ -../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/dracut b/config/rootfiles/core/next/filelists/dracut deleted file mode 120000 index 160869946..000000000 --- a/config/rootfiles/core/next/filelists/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/grub b/config/rootfiles/core/next/filelists/grub deleted file mode 120000 index 050745c10..000000000 --- a/config/rootfiles/core/next/filelists/grub +++ /dev/null @@ -1 +0,0 @@ -../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/iw b/config/rootfiles/core/next/filelists/iw deleted file mode 120000 index 7c58a2089..000000000 --- a/config/rootfiles/core/next/filelists/iw +++ /dev/null @@ -1 +0,0 @@ -../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/linux b/config/rootfiles/core/next/filelists/linux deleted file mode 120000 index c469fe188..000000000 --- a/config/rootfiles/core/next/filelists/linux +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/linux-firmware b/config/rootfiles/core/next/filelists/linux-firmware deleted file mode 120000 index 4bf91bca9..000000000 --- a/config/rootfiles/core/next/filelists/linux-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/wireless-regdb b/config/rootfiles/core/next/filelists/wireless-regdb deleted file mode 120000 index c9205b3cf..000000000 --- a/config/rootfiles/core/next/filelists/wireless-regdb +++ /dev/null @@ -1 +0,0 @@ -../../../common/wireless-regdb \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/zd1211-firmware b/config/rootfiles/core/next/filelists/zd1211-firmware deleted file mode 120000 index 33985ced8..000000000 --- a/config/rootfiles/core/next/filelists/zd1211-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/zd1211-firmware \ No newline at end of file diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 38a1f7821..5a4353ff4 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -23,116 +23,53 @@ # . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 -# -KVER="xxxKVERxxx" -MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi - # -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 -fi -echo First we made a backup of all files that was inside of the -echo update archive. This may take a while ... -# Add some files that are not in the package to backup -echo lib/modules >> /opt/pakfire/tmp/ROOTFILES -echo boot >> /opt/pakfire/tmp/ROOTFILES - -# Backup the files -tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 - -echo -echo Update Kernel to $KVER ... -# Remove old kernel, configs, initrd, modules ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/vmlinuz-* -rm -rf /lib/modules/*-ipfire -# -# Backup grub.conf -# -cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# Remove old core updates from pakfire cache to save space... +core=52 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done # -# Stop services to save memory -# -/etc/init.d/snort stop -/etc/init.d/squid stop +#Stop services + /etc/init.d/ipsec stop # -# Unpack the updated files -# -echo -echo Unpack the updated files ... -# -tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ - --no-overwrite-dir +# Remove old strongswan libs +rm -rf /usr/lib/libcharon.so +rm -rf /usr/lib/libcharon.so.0 +rm -rf /usr/lib/libcharon.so.0.0.0 +rm -rf /usr/lib/libhydra.so +rm -rf /usr/lib/libhydra.so.0 +rm -rf /usr/lib/libhydra.so.0.0.0 +rm -rf /usr/lib/libstrongswan.so +rm -rf /usr/lib/libstrongswan.so.0 +rm -rf /usr/lib/libstrongswan.so.0.0.0 +rm -rf /usr/libexec/ipsec/plugins # -# Enable ralink rt73 hardware encryption again -rm -f /etc/modprobe.d/ralink_wireless +#Extract files +extract_files # -# Start services -# -/etc/init.d/squid start -/etc/init.d/snort start +#Start services + if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi # -# Modify grub.conf -# -echo -echo Update grub configuration ... -ROOT=`mount | grep " / " | cut -d" " -f1` -if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` -fi -if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf -else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf -fi -sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf -sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf - -if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then - echo "grub use default console ..." -else - echo "grub use serial console ..." - sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf - sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf - sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf - sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf -fi -# -# ReInstall grub -# -grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck -# -# Rebuild Language -# +#Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors -## + +#Rebuild module dep's +#depmod 2.6.32.45-ipfire >/dev/null 2>&1 +#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1 + ## Change version of Pakfire.conf ## #OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` @@ -162,6 +99,10 @@ rm -rf /etc/sysconfig/lm_sensors #echo #echo Please wait until pakfire has ended... #echo -/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Upgrade finished. If you use a customized grub.cfg" -/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Check it before reboot !!!" -/usr/bin/logger -p syslog.emerg -t core-upgrade-next " *** Please reboot... *** " + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/libsatsolver b/config/rootfiles/packages/libsatsolver deleted file mode 100644 index eba54fb60..000000000 --- a/config/rootfiles/packages/libsatsolver +++ /dev/null @@ -1,52 +0,0 @@ -#usr/include/satsolver -#usr/include/satsolver/bitmap.h -#usr/include/satsolver/chksum.h -#usr/include/satsolver/dirpool.h -#usr/include/satsolver/evr.h -#usr/include/satsolver/hash.h -#usr/include/satsolver/knownid.h -#usr/include/satsolver/md5.h -#usr/include/satsolver/policy.h -#usr/include/satsolver/pool.h -#usr/include/satsolver/pool_fileconflicts.h -#usr/include/satsolver/poolarch.h -#usr/include/satsolver/poolid.h -#usr/include/satsolver/pooltypes.h -#usr/include/satsolver/poolvendor.h -#usr/include/satsolver/problems.h -#usr/include/satsolver/queue.h -#usr/include/satsolver/repo.h -#usr/include/satsolver/repo_content.h -#usr/include/satsolver/repo_deb.h -#usr/include/satsolver/repo_deltainfoxml.h -#usr/include/satsolver/repo_helix.h -#usr/include/satsolver/repo_products.h -#usr/include/satsolver/repo_releasefile_products.h -#usr/include/satsolver/repo_repomdxml.h -#usr/include/satsolver/repo_rpmdb.h -#usr/include/satsolver/repo_rpmmd.h -#usr/include/satsolver/repo_solv.h -#usr/include/satsolver/repo_susetags.h -#usr/include/satsolver/repo_updateinfoxml.h -#usr/include/satsolver/repo_write.h -#usr/include/satsolver/repo_zyppdb.h -#usr/include/satsolver/repodata.h -#usr/include/satsolver/repopage.h -#usr/include/satsolver/rules.h -#usr/include/satsolver/sat_xfopen.h -#usr/include/satsolver/satversion.h -#usr/include/satsolver/sha1.h -#usr/include/satsolver/sha2.h -#usr/include/satsolver/solvable.h -#usr/include/satsolver/solver.h -#usr/include/satsolver/solverdebug.h -#usr/include/satsolver/strpool.h -#usr/include/satsolver/tools_util.h -#usr/include/satsolver/transaction.h -#usr/include/satsolver/util.h -usr/lib/libsatsolver.so -usr/lib/libsatsolver.so.0 -usr/lib/libsatsolver.so.0.17 -usr/lib/libsatsolverext.so -usr/lib/libsatsolverext.so.0 -usr/lib/libsatsolverext.so.0.17 diff --git a/config/rootfiles/packages/libsolv b/config/rootfiles/packages/libsolv new file mode 100644 index 000000000..587d5149f --- /dev/null +++ b/config/rootfiles/packages/libsolv @@ -0,0 +1,47 @@ +#usr/include/solv +#usr/include/solv/bitmap.h +#usr/include/solv/chksum.h +#usr/include/solv/dirpool.h +#usr/include/solv/evr.h +#usr/include/solv/hash.h +#usr/include/solv/knownid.h +#usr/include/solv/policy.h +#usr/include/solv/pool.h +#usr/include/solv/pool_fileconflicts.h +#usr/include/solv/poolarch.h +#usr/include/solv/poolid.h +#usr/include/solv/pooltypes.h +#usr/include/solv/poolvendor.h +#usr/include/solv/problems.h +#usr/include/solv/queue.h +#usr/include/solv/repo.h +#usr/include/solv/repo_content.h +#usr/include/solv/repo_deb.h +#usr/include/solv/repo_deltainfoxml.h +#usr/include/solv/repo_helix.h +#usr/include/solv/repo_products.h +#usr/include/solv/repo_releasefile_products.h +#usr/include/solv/repo_repomdxml.h +#usr/include/solv/repo_rpmdb.h +#usr/include/solv/repo_rpmmd.h +#usr/include/solv/repo_solv.h +#usr/include/solv/repo_susetags.h +#usr/include/solv/repo_updateinfoxml.h +#usr/include/solv/repo_write.h +#usr/include/solv/repo_zyppdb.h +#usr/include/solv/repodata.h +#usr/include/solv/repopage.h +#usr/include/solv/rules.h +#usr/include/solv/solv_xfopen.h +#usr/include/solv/solvable.h +#usr/include/solv/solver.h +#usr/include/solv/solverdebug.h +#usr/include/solv/solvversion.h +#usr/include/solv/strpool.h +#usr/include/solv/tools_util.h +#usr/include/solv/transaction.h +#usr/include/solv/util.h +usr/lib/libsolv.so +usr/lib/libsolv.so.0 +usr/lib/libsolvext.so +usr/lib/libsolvext.so.0 diff --git a/config/rootfiles/packages/python-satsolver b/config/rootfiles/packages/python-satsolver deleted file mode 100644 index 6b5e5761d..000000000 --- a/config/rootfiles/packages/python-satsolver +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python2.7/site-packages/_satsolver.so -usr/lib/python2.7/site-packages/satsolver.py diff --git a/lfs/ccache b/lfs/ccache index 24073209d..6ae52330a 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -24,7 +24,7 @@ include Config -VER = 3.1 +VER = 3.1.6 THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7961852e1e36f11559039c32142f58df +$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e install : $(TARGET) diff --git a/lfs/strongswan b/lfs/strongswan index 7f92c19b4..1efd283bb 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 4.5.3dr7 +VER = 4.5.3 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 72036d309e254c0b3cad8e5473d68218 +$(DL_FILE)_MD5 = ee7c50a90c91307b111e8085f2479890 install : $(TARGET) diff --git a/src/patches/ccache-3.1-no_compiler_mtime.patch b/src/patches/ccache-3.1.6-no_compiler_mtime.patch similarity index 100% rename from src/patches/ccache-3.1-no_compiler_mtime.patch rename to src/patches/ccache-3.1.6-no_compiler_mtime.patch