| $Lang::tr{'fireinfo your profile id'}: |
- $profile_id
+ $profile_id
|
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index ff48333b7..17cb23292 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -259,9 +259,9 @@ if ($snortsettings{'OINKCODE'} ne "") {
if (!$errormessage) {
if ($snortsettings{'RULES'} eq 'subscripted') {
- $url=" https://www.snort.org/rules/snortrules-snapshot-29110.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+ $url=" https://www.snort.org/rules/snortrules-snapshot-29111.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'registered') {
- $url=" https://www.snort.org/rules/snortrules-snapshot-29110.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+ $url=" https://www.snort.org/rules/snortrules-snapshot-29111.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'community') {
$url=" https://www.snort.org/rules/community";
} else {
diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
index 605873ac0..69835370b 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -349,7 +349,7 @@ foreach $_ (@slice)
if($iface eq $country || $srcaddr ne '') {
my $ccode='';
if($iface ne $country) {
- $ccode = $gi->country_code_by_name($srcaddr);
+ $ccode = &GeoIP::lookup($srcaddr);
}
if($iface eq $country || $ccode eq uc($country)) {
my $chain = '';
diff --git a/html/cgi-bin/logs.cgi/urlfilter.dat b/html/cgi-bin/logs.cgi/urlfilter.dat
index ce642e1cb..221ed74ac 100644
--- a/html/cgi-bin/logs.cgi/urlfilter.dat
+++ b/html/cgi-bin/logs.cgi/urlfilter.dat
@@ -304,6 +304,10 @@ if ($cgiparams{'LOGTYPE'} eq 'urlfilter')
if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @slice = reverse @slice; }
+if ($lines != 0) {
+
+&oldernewer();
+
if ($lines)
{
@@ -369,7 +373,7 @@ if ($lines)
print "
\n";
}
-
+}
&oldernewer();
&Header::closebox();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 7c1074edd..07bef906b 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -8,6 +8,7 @@
'Add Rule' => 'Regel hinzufügen',
'Add a route' => 'Eine Route hinzufügen',
'Async logging enabled' => 'Aktiviere asynchrones Schreiben des Syslogs',
+'Captive' => 'Captive-Portal',
'Captive 1day' => '1 Tag',
'Captive 1month' => '1 Monat',
'Captive 1week' => '1 Woche',
@@ -43,7 +44,6 @@
'Captive logo_upload' => 'Logo hochladen',
'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)',
'Captive mac' => 'MAC-Adresse',
-'Captive menu' => 'Captive-Portal',
'Captive noexpiretime' => 'Es wurde kein gültiger Verbindungszeitraum angegeben',
'Captive nolimit' => 'Unbegrenzt',
'Captive nr' => 'Nummer',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3940d7b7c..a22c4b566 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -8,6 +8,7 @@
'Add Rule' => 'Add rule',
'Add a route' => 'Add a route',
'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
+'Captive' => 'Captive Portal',
'Captive 1day' => '1 day',
'Captive 1month' => '1 month',
'Captive 1week' => '1 week',
@@ -42,7 +43,6 @@
'Captive logo uploaded' => 'Logo uploaded',
'Captive logo_set' => 'Current Logo',
'Captive mac' => 'MAC Address',
-'Captive menu' => 'Captive Portal',
'Captive noexpiretime' => 'No valid connection time range given',
'Captive nolimit' => 'unlimited',
'Captive nr' => 'Number',
diff --git a/lfs/cdrom b/lfs/cdrom
index 7a7fff166..7056e9a0b 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog
ifneq "$(BUILD_PLATFORM)" "arm"
cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz
- dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
+ dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png
cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest
cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot
diff --git a/lfs/glib b/lfs/glib
index 1b43287ac..b0ed6ceb2 100644
--- a/lfs/glib
+++ b/lfs/glib
@@ -24,7 +24,7 @@
include Config
-VER = 2.32.3
+VER = 2.54.3
THISAPP = glib-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9bd3ac535c24b6c162be13b2c43c5adc
+$(DL_FILE)_MD5 = 16e886ad677bf07b7d48eb8188bcf759
install : $(TARGET)
diff --git a/lfs/gzip b/lfs/gzip
index 233c6ce40..2318338cf 100644
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -24,7 +24,7 @@
include Config
-VER = 1.8
+VER = 1.9
THISAPP = gzip-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f7caabb65cddc1a4165b398009bd05b9
+$(DL_FILE)_MD5 = 9492c6ccb2239ff679a5475a7bb543ed
install : $(TARGET)
diff --git a/lfs/hdparm b/lfs/hdparm
index c26131eaa..68620bd6e 100644
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -24,7 +24,7 @@
include Config
-VER = 9.52
+VER = 9.53
THISAPP = hdparm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 410539d0bf3cc247181594581edbfb53
+$(DL_FILE)_MD5 = 1e54b52e0c8cb79389d4d47eacba411d
install : $(TARGET)
diff --git a/lfs/initscripts b/lfs/initscripts
index 7d07b8ab3..9d3a52c77 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -134,9 +134,6 @@ $(TARGET) :
ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random
ln -sf ../init.d/random /etc/rc.d/rc6.d/K45random
ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local
- ln -sf ../init.d/mediatomb /etc/rc.d/rc3.d/S98mediatomb
- ln -sf ../init.d/mediatomb /etc/rc.d/rc0.d/K02mediatomb
- ln -sf ../init.d/mediatomb /etc/rc.d/rc6.d/K02mediatomb
ln -sf ../init.d/client175 /etc/rc.d/rc0.d/K34client175
ln -sf ../init.d/client175 /etc/rc.d/rc3.d/S66client175
ln -sf ../init.d/client175 /etc/rc.d/rc6.d/K34client175
diff --git a/lfs/linux-initrd b/lfs/linux-initrd
index b5cc42212..e4d449b24 100644
--- a/lfs/linux-initrd
+++ b/lfs/linux-initrd
@@ -62,7 +62,7 @@ ifneq "$(KCFG)" "-rpi"
ifneq "$(KCFG)" "-pae"
# Create initramfs images
- dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
+ dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
ifeq "$(KCFG)" "-kirkwood"
cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
diff --git a/lfs/mediatomb b/lfs/mdns-repeater
similarity index 78%
rename from lfs/mediatomb
rename to lfs/mdns-repeater
index d7ae4cf6d..4b3d3a784 100644
--- a/lfs/mediatomb
+++ b/lfs/mdns-repeater
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team #
+# 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 #
@@ -24,17 +24,19 @@
include Config
-VER = 0.12.1
+VER = 1.10
-THISAPP = mediatomb-$(VER)
+THISAPP = mdns-repeater-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = mediatomb
-PAK_VER = 6
+PROG = mdns-repeater
+PAK_VER = 1
-DEPS = "ffmpeg libexif taglib "
+DEPS = ""
+
+CFLAGS += -DHGVERSION='\"$(VER)\"'
###############################################################################
# Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e927dd5dc52d3cfcebd8ca1af6f0d3c2
+$(DL_FILE)_MD5 = 6dba5f891b50c2267f45a7760894fcb6
install : $(TARGET)
@@ -76,18 +78,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- cp -Rvd $(DIR_SRC)/config/mediatomb /var/ipfire
- chown -R nobody:nobody /var/ipfire/mediatomb
- install -v -m 644 $(DIR_SRC)/config/backup/includes/mediatomb \
- /var/ipfire/backup/addons/includes/mediatomb
- echo Folder for music files > /var/mp3/info
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
+ cd $(DIR_APP) && install -v -m 755 mdns-repeater /usr/bin
- #install initscripts
- $(call INSTALL_INITSCRIPT,mediatomb)
+ # install initscripts
+ $(call INSTALL_INITSCRIPT,mdns-repeater)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/owncloud b/lfs/owncloud
deleted file mode 100644
index c13e29678..000000000
--- a/lfs/owncloud
+++ /dev/null
@@ -1,102 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team #
-# #
-# 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 . #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 7.0.11
-
-THISAPP = owncloud-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = owncloud
-PAK_VER = 7
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 1f4839e43bc910a9acd8700fb9923b3a
-
-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_SRC)/$(PROG) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_SRC) && cp -vrf owncloud /srv/web/
-
- # Rename files with spaces in the name.
- while read -r file; do \
- mv -v "$${file}" "$${file//\ /_}"; \
- done <<< "$$(find /srv/web/owncloud | grep ' ')"
-
- # Create data directory
- mkdir -pv /var/owncloud/data
- ln -s /var/owncloud/data /srv/web/owncloud/data
-
- # Make sure everything is owned by root, except...
- chown -R root.root /srv/web/owncloud
- chown -R nobody.nobody /srv/web/owncloud/{apps,data,config}
-
- install -v -m644 $(DIR_SRC)/config/owncloud/owncloud.conf \
- /etc/httpd/conf/vhosts.d/
- install -v -m 644 $(DIR_SRC)/config/backup/includes/owncloud \
- /var/ipfire/backup/addons/includes/owncloud
-
- @rm -rf $(DIR_SRC)/$(PROG)
- @$(POSTBUILD)
diff --git a/lfs/php b/lfs/php
deleted file mode 100644
index 8717ccac1..000000000
--- a/lfs/php
+++ /dev/null
@@ -1,140 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team #
-# #
-# 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 . #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 5.3.27
-
-THISAPP = php-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-
-ifeq "$(BUILD_PLATFORM)" "arm"
- CFLAGS := $(patsubst -march=%,,$(CFLAGS))
-endif
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) idn-0.1.tgz Log-1.9.11.tgz
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
-Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
-
-$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
-idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
-Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
-
-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) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \
- cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_APP) && ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --with-apxs2 \
- --enable-force-cgi-redirect \
- --enable-discard-path \
- --enable-fastcgi \
- --with-config-file-path=/etc \
- --with-openssl \
- --with-kerberos \
- --with-zlib \
- --enable-bcmath \
- --with-bz2 \
- --enable-calendar \
- --with-curl \
- --with-curlwrappers \
- --enable-dba=shared \
- --with-gdbm \
- --with-db4 \
- --with-inifile \
- --with-flatfile \
- --enable-exif \
- --enable-ftp \
- --with-openssl-dir=/usr \
- --with-gd=/usr \
- --with-jpeg-dir=/usr \
- --with-png-dir=/usr \
- --with-zlib-dir=/usr \
- --with-freetype-dir=/usr \
- --with-gettext \
- --with-gmp \
- --enable-mbstring \
- --with-mysql \
- --with-mysql-sock=/var/run/mysql \
- --with-ncurses \
- --with-pdo-mysql \
- --with-pdo-sqlite \
- --with-readline \
- --enable-sockets \
- --with-xsl \
- --with-iconv \
- --enable-zip
-
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
- -grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
- mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf
- cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.1.tgz
- -rm -f $(DIR_SRC)/package.xml
- cd $(DIR_SRC)/idn-* && phpize
- cd $(DIR_SRC)/idn-* && ./configure --prefix=/usr --with-idn
- cd $(DIR_SRC)/idn-* && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_SRC)/idn-* && make install
- cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.9.11.tgz
- -rm -f $(DIR_SRC)/package.xml
- cd $(DIR_SRC)/Log-* && cp -av Log Log.php /usr/lib/php
- @rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml
- @$(POSTBUILD)
diff --git a/lfs/snort b/lfs/snort
index f66bf0127..a5d0535b0 100644
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
include Config
-VER = 2.9.11
+VER = 2.9.11.1
THISAPP = snort-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4f3ee0c2ad330e487273016efd0c9d64
+$(DL_FILE)_MD5 = 378e3938b2b5c8e358f942d0ffce18cc
install : $(TARGET)
diff --git a/lfs/tor b/lfs/tor
index af84d186e..686129451 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2017 IPFire Team #
+# Copyright (C) 2007-2018 IPFire Team #
# #
# 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 0.3.1.9
+VER = 0.3.2.9
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 25
+PAK_VER = 26
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 585e62d086ae7df7cd873f735d726118
+$(DL_FILE)_MD5 = 9aafe4d11464548346fdfb95a3eb9e83
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 8c40bf635..831faa728 100755
--- a/make.sh
+++ b/make.sh
@@ -537,7 +537,7 @@ entershell() {
fi
echo "Entering to a shell inside LFS chroot, go out with exit"
- local PS1="ipfire build chroot ($(uname -m)) \u:\w\$ "
+ local PS1="ipfire build chroot (${BUILD_ARCH}) \u:\w\$ "
if enterchroot bash -i; then
stdumount
@@ -1120,6 +1120,7 @@ buildipfire() {
lfsmake2 linux-initrd KCFG="-kirkwood"
;;
esac
+ lfsmake2 intel-microcode
lfsmake2 xtables-addons USPACE="1"
lfsmake2 openssl
[ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
@@ -1178,7 +1179,6 @@ buildipfire() {
lfsmake2 cyrus-sasl
lfsmake2 openldap
lfsmake2 apache2
- lfsmake2 php
lfsmake2 web-user-interface
lfsmake2 flag-icons
lfsmake2 jquery
@@ -1410,7 +1410,6 @@ buildipfire() {
lfsmake2 streamripper
lfsmake2 sshfs
lfsmake2 taglib
- #lfsmake2 mediatomb
lfsmake2 sslh
lfsmake2 perl-gettext
lfsmake2 perl-Sort-Naturally
@@ -1488,7 +1487,6 @@ buildipfire() {
lfsmake2 iptraf-ng
lfsmake2 iotop
lfsmake2 stunnel
- lfsmake2 owncloud
lfsmake2 bacula
lfsmake2 batctl
lfsmake2 perl-Font-TTF
@@ -1518,6 +1516,7 @@ buildipfire() {
lfsmake2 perl-Net-IP
lfsmake2 wio
lfsmake2 iftop
+ lfsmake2 mdns-repeater
}
buildinstaller() {
diff --git a/src/initscripts/packages/mdns-repeater b/src/initscripts/packages/mdns-repeater
new file mode 100644
index 000000000..49717a1a1
--- /dev/null
+++ b/src/initscripts/packages/mdns-repeater
@@ -0,0 +1,48 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/mdns-repeater
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+
+INTERFACES=
+
+if [ -n "${GREEN_DEV}" ]; then
+ INTERFACES="${INTERFACES} ${GREEN_DEV}"
+fi
+
+if [ -n "${BLUE_DEV}" ]; then
+ INTERFACES="${INTERFACES} ${BLUE_DEV}"
+fi
+
+case "${1}" in
+ start)
+ boot_mesg "Starting Multicast DNS Repeater..."
+ loadproc /usr/bin/mdns-repeater ${INTERFACES}
+ ;;
+
+ stop)
+ boot_mesg "Stopping Multicast DNS Repeater..."
+ killproc /usr/bin/mdns-repeater
+ ;;
+
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+
+ status)
+ statusproc /usr/bin/mdns-repeater
+ ;;
+
+ *)
+ echo "Usage: ${0} {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/mdns-repeater
diff --git a/src/initscripts/packages/mediatomb b/src/initscripts/packages/mediatomb
deleted file mode 100644
index 634e0db0c..000000000
--- a/src/initscripts/packages/mediatomb
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/
-#
-# Description : mediatomb initscript
-#
-# Authors : Arne Fitzenreiter
-#
-# Version : 01.00
-#
-# Notes : for www.ipfire.org - GPLv3
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "$1" in
- start)
- boot_mesg "Starting mediatomb uPnP Mediaserver..."
- route add -net 239.0.0.0 netmask 255.0.0.0 green0
- loadproc /usr/bin/mediatomb -u nobody -g nobody \
- -c /var/ipfire/mediatomb/config.xml \
- -l /var/log/mediatomb.log \
- -e green0 $2 $3 $4 $5 $6 $7 -d
- evaluate_retval
- ;;
-
-
- stop)
- boot_mesg "Stopping mediatomb uPnP Mediaserver..."
- killproc /usr/bin/mediatomb
- evaluate_retval
- route del -net 239.0.0.0 netmask 255.0.0.0 green0
- ;;
-
- restart)
- ${0} stop
- sleep 1
- ${0} start
-
- ;;
- status)
- statusproc /usr/bin/mediatomb
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|init|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index e5f82c567..d11fffa69 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -60,7 +60,7 @@ depmod -a $KVER-ipfire-pae
#
# Made initramdisk
#
-/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae
+/usr/bin/dracut --early-microcode --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae
if [ -e /boot/grub/grub.cfg ]; then
#
diff --git a/src/paks/mediatomb/install.sh b/src/paks/mdns-repeater/install.sh
similarity index 85%
rename from src/paks/mediatomb/install.sh
rename to src/paks/mdns-repeater/install.sh
index 682363b5c..233f6a88e 100644
--- a/src/paks/mediatomb/install.sh
+++ b/src/paks/mdns-repeater/install.sh
@@ -22,5 +22,16 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+
extract_files
restore_backup ${NAME}
+
+# create startlinks
+ln -sf ../init.d/mdns-repeater /etc/rc.d/rc0.d/K20mdns-repeater
+ln -sf ../init.d/mdns-repeater /etc/rc.d/rc3.d/S99mdns-repeater
+ln -sf ../init.d/mdns-repeater /etc/rc.d/rc6.d/K20mdns-repeater
+
+# Start the service.
+start_service --background ${NAME}
+
+exit 0
diff --git a/src/paks/mediatomb/uninstall.sh b/src/paks/mdns-repeater/uninstall.sh
similarity index 95%
rename from src/paks/mediatomb/uninstall.sh
rename to src/paks/mdns-repeater/uninstall.sh
index a7b8a5370..91e77623c 100644
--- a/src/paks/mediatomb/uninstall.sh
+++ b/src/paks/mdns-repeater/uninstall.sh
@@ -25,3 +25,8 @@
stop_service ${NAME}
make_backup ${NAME}
remove_files
+
+# Remove all start links.
+rm -rf /etc/rc.d/rc*.d/*mdns-repeater
+
+exit 0
diff --git a/src/paks/owncloud/update.sh b/src/paks/mdns-repeater/update.sh
similarity index 99%
rename from src/paks/owncloud/update.sh
rename to src/paks/mdns-repeater/update.sh
index 89c40d0d7..c6485bf0a 100644
--- a/src/paks/owncloud/update.sh
+++ b/src/paks/mdns-repeater/update.sh
@@ -22,5 +22,6 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+
./uninstall.sh
./install.sh
diff --git a/src/paks/mediatomb/update.sh b/src/paks/mediatomb/update.sh
deleted file mode 100644
index 8fae80d98..000000000
--- a/src/paks/mediatomb/update.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team . #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
-/etc/init.d/mediatomb start
diff --git a/src/paks/owncloud/install.sh b/src/paks/owncloud/install.sh
deleted file mode 100644
index e2ad07d40..000000000
--- a/src/paks/owncloud/install.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team . #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-
-# Fix permissions.
-chmod 777 /srv/web/owncloud/apps
-chmod 777 /srv/web/owncloud/config
-
-# Create data directory.
-mkdir -p /var/owncloud/data
-chown -R nobody:nobody /var/owncloud
-
-# Import web interface certificates if none exist.
-if [ ! -e "/etc/httpd/owncloud.crt" ] && [ ! -e "/etc/httpd/owncloud.key" ]; then
- cat /etc/httpd/server.crt > /etc/httpd/owncloud.crt
- cat /etc/httpd/server.key > /etc/httpd/owncloud.key
-fi
-
-/etc/init.d/apache reload
-
-exit 0
diff --git a/src/paks/owncloud/uninstall.sh b/src/paks/owncloud/uninstall.sh
deleted file mode 100644
index 9e2578fa9..000000000
--- a/src/paks/owncloud/uninstall.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team . #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-make_backup ${NAME}
-remove_files
-
-/etc/init.d/apache reload
-
-exit 0
diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd
index 06f30bbf0..2ec8fda50 100644
--- a/src/scripts/rebuild-initrd
+++ b/src/scripts/rebuild-initrd
@@ -24,4 +24,4 @@
#
KVER=`uname -r | cut -d"-" -f1`
-dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire
+dracut --early-microcode --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire