Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 3f22b725c42462b3bff65a1bd77bc2441b5d18b2..dc22367ec77ea0354825cdbbf11ab2ac4b2bac5f 100644 (file)
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -341,7 +341,6 @@ srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
 srv/web/ipfire/html/themes/maniac
 srv/web/ipfire/html/themes/maniac/images
 srv/web/ipfire/html/themes/maniac/images/IPFire.png
-srv/web/ipfire/html/themes/maniac/images/Thumbs.db
 srv/web/ipfire/html/themes/maniac/images/b1.gif
 srv/web/ipfire/html/themes/maniac/images/b2.gif
 srv/web/ipfire/html/themes/maniac/images/b3.gif

diff --git a/config/rootfiles/packages/perl-Authen-SASL b/config/rootfiles/packages/perl-Authen-SASL
new file mode 100644 (file)
index 0000000..a44b726
--- /dev/null
+++ b/config/rootfiles/packages/perl-Authen-SASL
@@ -0,0 +1,28 @@
+#usr/lib/perl5/site_perl/5.12.3/Authen
+#usr/lib/perl5/site_perl/5.12.3/Authen/SASL
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL.pm
+#usr/lib/perl5/site_perl/5.12.3/Authen/SASL.pod
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/CRAM_MD5.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/EXTERNAL.pm
+#usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl.pm
+#usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl.pod
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/ANONYMOUS.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/CRAM_MD5.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/DIGEST_MD5.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/EXTERNAL.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/GSSAPI.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/LOGIN.pm
+usr/lib/perl5/site_perl/5.12.3/Authen/SASL/Perl/PLAIN.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen/SASL
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Authen/SASL/.packlist
+#usr/share/man/man3/Authen::SASL.3
+#usr/share/man/man3/Authen::SASL::Perl.3
+#usr/share/man/man3/Authen::SASL::Perl::ANONYMOUS.3
+#usr/share/man/man3/Authen::SASL::Perl::CRAM_MD5.3
+#usr/share/man/man3/Authen::SASL::Perl::DIGEST_MD5.3
+#usr/share/man/man3/Authen::SASL::Perl::EXTERNAL.3
+#usr/share/man/man3/Authen::SASL::Perl::GSSAPI.3
+#usr/share/man/man3/Authen::SASL::Perl::LOGIN.3
+#usr/share/man/man3/Authen::SASL::Perl::PLAIN.3

diff --git a/config/rootfiles/packages/perl-MIME-Base64 b/config/rootfiles/packages/perl-MIME-Base64
new file mode 100644 (file)
index 0000000..59ca61f
--- /dev/null
+++ b/config/rootfiles/packages/perl-MIME-Base64
@@ -0,0 +1,7 @@
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME/Base64.pm
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/MIME/QuotedPrint.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/Base64.bs
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/MIME/Base64/Base64.so

diff --git a/config/rootfiles/packages/perl-Net-SMTP-SSL b/config/rootfiles/packages/perl-Net-SMTP-SSL
new file mode 100644 (file)
index 0000000..c39425e
--- /dev/null
+++ b/config/rootfiles/packages/perl-Net-SMTP-SSL
@@ -0,0 +1,6 @@
+#usr/lib/perl5/site_perl/5.12.3/Net/SMTP
+usr/lib/perl5/site_perl/5.12.3/Net/SMTP/SSL.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP/SSL
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/SMTP/SSL/.packlist
+#usr/share/man/man3/Net::SMTP::SSL.3

diff --git a/html/html/themes/maniac/images/Thumbs.db b/html/html/themes/maniac/images/Thumbs.db
deleted file mode 100644 (file)
index 37ec790..0000000
Binary files a/html/html/themes/maniac/images/Thumbs.db and /dev/null differ

diff --git a/lfs/git b/lfs/git
index 23838e4e54d859f028293dcee68d799a86a11056..51936ab4dca986f6e5f05fcfc433943eaea3aac6 100644 (file)
--- a/lfs/git
+++ b/lfs/git
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 10
+PAK_VER    = 11
 
-DEPS       = ""
+DEPS       = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/perl-Authen-SASL b/lfs/perl-Authen-SASL
new file mode 100644 (file)
index 0000000..4052c44
--- /dev/null
+++ b/lfs/perl-Authen-SASL
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
+#                                                                             #
+# 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        = 2.16
+
+THISAPP    = Authen-SASL-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-Authen-SASL
+DEPS       = ""
+PAK_VER    = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7c03a689d4c689e5a9e2f18a1c586b2f
+
+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) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/perl-MIME-Base64 b/lfs/perl-MIME-Base64
new file mode 100644 (file)
index 0000000..f406ae9
--- /dev/null
+++ b/lfs/perl-MIME-Base64
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
+#                                                                             #
+# 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        = 3.15
+
+THISAPP    = MIME-Base64-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-MIME-Base64
+DEPS       = ""
+PAK_VER    = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ef958dc2bf96be5f759391c6ac1debd4
+
+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) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/perl-Net-SMTP-SSL b/lfs/perl-Net-SMTP-SSL
new file mode 100644 (file)
index 0000000..2e2ec57
--- /dev/null
+++ b/lfs/perl-Net-SMTP-SSL
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
+#                                                                             #
+# 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        = 1.02
+
+THISAPP    = Net-SMTP-SSL-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = perl-Net-SMTP-SSL
+DEPS       = ""
+PAK_VER    = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = e67b4d842a51b9a453aeeaeed45fb8e1
+
+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) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index bcbeffb418c74872ab88af4717ae09ea36233cf4..db16c55dc15745299a036e4113bd7331df00407b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -702,6 +702,9 @@ buildipfire() {
   ipfiremake mpd
   ipfiremake libmpdclient
   ipfiremake mpc
+  ipfiremake perl-Net-SMTP-SSL
+  ipfiremake perl-MIME-Base64
+  ipfiremake perl-Authen-SASL
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake vnstat