From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 98b8cabf4d80909b636e56a59091665798043f61
Date: Tue, 22 Dec 2015 23:31:14 +0100 [thread overview]
Message-ID: <20151222223115.A883821E7C@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 30091 bytes --]
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, next has been updated
via 98b8cabf4d80909b636e56a59091665798043f61 (commit)
via 6138d53bdd9df4a007361c3e63ab602e2c2de443 (commit)
via 3b7808295e2627ac9a0c8a79a793262ac6cd545a (commit)
via ffea9709f83fae4f9b7e249d7f5cdc2501259607 (commit)
from f295ca0cf75d0b475303a9db905e3ab082290997 (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 98b8cabf4d80909b636e56a59091665798043f61
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 21:25:27 2015 +0000
dnsdist: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6138d53bdd9df4a007361c3e63ab602e2c2de443
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Dec 10 21:10:06 2015 +0000
lua: New package
Simple scripting language. Supposed to be fast. Needed for dnsdist.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3b7808295e2627ac9a0c8a79a793262ac6cd545a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 22 22:27:10 2015 +0000
Disable packaging mediatomb
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ffea9709f83fae4f9b7e249d7f5cdc2501259607
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 22 22:25:18 2015 +0000
linux: Fix build of kernel and headers package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/lua | 14 ++
config/rootfiles/packages/dnsdist | 2 +
.../packages/{mediatomb => mediatomb.off} | 0
lfs/{pango => dnsdist} | 18 +-
lfs/linux | 6 +-
lfs/{libmpc => lua} | 9 +-
make.sh | 2 +
src/initscripts/init.d/dnsdist | 46 +++++
src/patches/lua-5.3.0-autotoolize.patch | 192 +++++++++++++++++++++
9 files changed, 280 insertions(+), 9 deletions(-)
create mode 100644 config/rootfiles/common/lua
create mode 100644 config/rootfiles/packages/dnsdist
rename config/rootfiles/packages/{mediatomb => mediatomb.off} (100%)
copy lfs/{pango => dnsdist} (91%)
copy lfs/{libmpc => lua} (91%)
create mode 100644 src/initscripts/init.d/dnsdist
create mode 100644 src/patches/lua-5.3.0-autotoolize.patch
Difference in files:
diff --git a/config/rootfiles/common/lua b/config/rootfiles/common/lua
new file mode 100644
index 0000000..15d5995
--- /dev/null
+++ b/config/rootfiles/common/lua
@@ -0,0 +1,14 @@
+usr/bin/lua
+usr/bin/luac
+#usr/include/lauxlib.h
+#usr/include/lua.h
+#usr/include/lua.hpp
+#usr/include/luaconf.h
+#usr/include/lualib.h
+usr/lib/liblua-5.3.so
+#usr/lib/liblua.a
+#usr/lib/liblua.la
+usr/lib/liblua.so
+#usr/lib/pkgconfig/lua.pc
+#usr/share/man/man1/lua.1
+#usr/share/man/man1/luac.1
diff --git a/config/rootfiles/packages/dnsdist b/config/rootfiles/packages/dnsdist
new file mode 100644
index 0000000..8b1e15d
--- /dev/null
+++ b/config/rootfiles/packages/dnsdist
@@ -0,0 +1,2 @@
+usr/bin/dnsdist
+#usr/share/man/man1/dnsdist.1
diff --git a/config/rootfiles/packages/mediatomb b/config/rootfiles/packages/mediatomb
deleted file mode 100644
index fd72752..0000000
--- a/config/rootfiles/packages/mediatomb
+++ /dev/null
@@ -1,104 +0,0 @@
-usr/bin/mediatomb
-#usr/share/man/man1/mediatomb.1
-#usr/share/mediatomb
-#usr/share/mediatomb/js
-usr/share/mediatomb/js/common.js
-usr/share/mediatomb/js/import.js
-usr/share/mediatomb/js/playlists.js
-usr/share/mediatomb/mappings.xml
-usr/share/mediatomb/mysql.sql
-usr/share/mediatomb/sqlite3.sql
-#usr/share/mediatomb/web
-usr/share/mediatomb/web/cds.xml
-usr/share/mediatomb/web/cm.xml
-usr/share/mediatomb/web/disabled.html
-usr/share/mediatomb/web/favicon.ico
-#usr/share/mediatomb/web/icons
-usr/share/mediatomb/web/icons/add_as_autoscan.png
-usr/share/mediatomb/web/icons/autoscan_inotify_config_folder_open.png
-usr/share/mediatomb/web/icons/autoscan_inotify_folder_open.png
-usr/share/mediatomb/web/icons/autoscan_timed_config_folder_open.png
-usr/share/mediatomb/web/icons/autoscan_timed_folder_open.png
-usr/share/mediatomb/web/icons/blank.gif
-usr/share/mediatomb/web/icons/blank.png
-usr/share/mediatomb/web/icons/document-new.png
-usr/share/mediatomb/web/icons/film.png
-usr/share/mediatomb/web/icons/folder_new.png
-usr/share/mediatomb/web/icons/folder_open.png
-usr/share/mediatomb/web/icons/go-first.png
-usr/share/mediatomb/web/icons/go-last.png
-usr/share/mediatomb/web/icons/go-next.png
-usr/share/mediatomb/web/icons/go-previous.png
-usr/share/mediatomb/web/icons/mediatomb.png
-usr/share/mediatomb/web/icons/mt-icon120.bmp
-usr/share/mediatomb/web/icons/mt-icon120.jpg
-usr/share/mediatomb/web/icons/mt-icon120.png
-usr/share/mediatomb/web/icons/mt-icon32.bmp
-usr/share/mediatomb/web/icons/mt-icon32.jpg
-usr/share/mediatomb/web/icons/mt-icon32.png
-usr/share/mediatomb/web/icons/mt-icon48.bmp
-usr/share/mediatomb/web/icons/mt-icon48.jpg
-usr/share/mediatomb/web/icons/mt-icon48.png
-#usr/share/mediatomb/web/icons/nanotree
-#usr/share/mediatomb/web/icons/nanotree/images
-usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_config_folder_closed.png
-usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_config_folder_open.png
-usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_folder_closed.png
-usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_folder_open.png
-usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_config_folder_closed.png
-usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_config_folder_open.png
-usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_folder_closed.png
-usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_folder_open.png
-usr/share/mediatomb/web/icons/nanotree/images/folder_closed.png
-usr/share/mediatomb/web/icons/nanotree/images/folder_open.png
-usr/share/mediatomb/web/icons/nanotree/images/lastnode.png
-usr/share/mediatomb/web/icons/nanotree/images/line.png
-usr/share/mediatomb/web/icons/nanotree/images/minus.png
-usr/share/mediatomb/web/icons/nanotree/images/minus_last.png
-usr/share/mediatomb/web/icons/nanotree/images/minus_last_no_root.png
-usr/share/mediatomb/web/icons/nanotree/images/minus_no_root.png
-usr/share/mediatomb/web/icons/nanotree/images/plus.png
-usr/share/mediatomb/web/icons/nanotree/images/plus_last.png
-usr/share/mediatomb/web/icons/nanotree/images/plus_last_no_root.png
-usr/share/mediatomb/web/icons/nanotree/images/plus_no_root.png
-usr/share/mediatomb/web/icons/nanotree/images/t.png
-usr/share/mediatomb/web/icons/nanotree/images/t_no_root.png
-usr/share/mediatomb/web/icons/nanotree/images/white.png
-usr/share/mediatomb/web/icons/remove_all.png
-usr/share/mediatomb/web/icons/remove_autoscan.png
-usr/share/mediatomb/web/icons/remove_this.png
-usr/share/mediatomb/web/icons/status.png
-usr/share/mediatomb/web/icons/status_loading.png
-usr/share/mediatomb/web/icons/status_updates_pending.png
-usr/share/mediatomb/web/icons/stock-add.png
-usr/share/mediatomb/web/icons/stock_edit.png
-usr/share/mediatomb/web/icons/stock_exit.png
-usr/share/mediatomb/web/index.html
-#usr/share/mediatomb/web/js
-usr/share/mediatomb/web/js/auth.js
-usr/share/mediatomb/web/js/autoscan.js
-usr/share/mediatomb/web/js/icons.js
-usr/share/mediatomb/web/js/iepngfix.htc
-usr/share/mediatomb/web/js/items.js
-usr/share/mediatomb/web/js/md5.js
-usr/share/mediatomb/web/js/nanotree.js
-usr/share/mediatomb/web/js/prototype.js
-usr/share/mediatomb/web/js/tasks.js
-usr/share/mediatomb/web/js/tools.js
-usr/share/mediatomb/web/js/tree.js
-usr/share/mediatomb/web/left.html
-usr/share/mediatomb/web/main.css
-usr/share/mediatomb/web/mr_reg.xml
-usr/share/mediatomb/web/right.html
-usr/share/mediatomb/web/std_treelook.css
-usr/share/mediatomb/web/top.html
-usr/share/mediatomb/web/topleft.html
-usr/share/mediatomb/web/topright.html
-var/ipfire/backup/addons/includes/mediatomb
-var/ipfire/mediatomb
-#var/ipfire/mediatomb/config.xml
-etc/rc.d/init.d/mediatomb
-etc/rc.d/rc0.d/K02mediatomb
-etc/rc.d/rc6.d/K02mediatomb
-etc/rc.d/rc3.d/S98mediatomb
-var/mp3/info
diff --git a/config/rootfiles/packages/mediatomb.off b/config/rootfiles/packages/mediatomb.off
new file mode 100644
index 0000000..fd72752
--- /dev/null
+++ b/config/rootfiles/packages/mediatomb.off
@@ -0,0 +1,104 @@
+usr/bin/mediatomb
+#usr/share/man/man1/mediatomb.1
+#usr/share/mediatomb
+#usr/share/mediatomb/js
+usr/share/mediatomb/js/common.js
+usr/share/mediatomb/js/import.js
+usr/share/mediatomb/js/playlists.js
+usr/share/mediatomb/mappings.xml
+usr/share/mediatomb/mysql.sql
+usr/share/mediatomb/sqlite3.sql
+#usr/share/mediatomb/web
+usr/share/mediatomb/web/cds.xml
+usr/share/mediatomb/web/cm.xml
+usr/share/mediatomb/web/disabled.html
+usr/share/mediatomb/web/favicon.ico
+#usr/share/mediatomb/web/icons
+usr/share/mediatomb/web/icons/add_as_autoscan.png
+usr/share/mediatomb/web/icons/autoscan_inotify_config_folder_open.png
+usr/share/mediatomb/web/icons/autoscan_inotify_folder_open.png
+usr/share/mediatomb/web/icons/autoscan_timed_config_folder_open.png
+usr/share/mediatomb/web/icons/autoscan_timed_folder_open.png
+usr/share/mediatomb/web/icons/blank.gif
+usr/share/mediatomb/web/icons/blank.png
+usr/share/mediatomb/web/icons/document-new.png
+usr/share/mediatomb/web/icons/film.png
+usr/share/mediatomb/web/icons/folder_new.png
+usr/share/mediatomb/web/icons/folder_open.png
+usr/share/mediatomb/web/icons/go-first.png
+usr/share/mediatomb/web/icons/go-last.png
+usr/share/mediatomb/web/icons/go-next.png
+usr/share/mediatomb/web/icons/go-previous.png
+usr/share/mediatomb/web/icons/mediatomb.png
+usr/share/mediatomb/web/icons/mt-icon120.bmp
+usr/share/mediatomb/web/icons/mt-icon120.jpg
+usr/share/mediatomb/web/icons/mt-icon120.png
+usr/share/mediatomb/web/icons/mt-icon32.bmp
+usr/share/mediatomb/web/icons/mt-icon32.jpg
+usr/share/mediatomb/web/icons/mt-icon32.png
+usr/share/mediatomb/web/icons/mt-icon48.bmp
+usr/share/mediatomb/web/icons/mt-icon48.jpg
+usr/share/mediatomb/web/icons/mt-icon48.png
+#usr/share/mediatomb/web/icons/nanotree
+#usr/share/mediatomb/web/icons/nanotree/images
+usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_config_folder_closed.png
+usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_config_folder_open.png
+usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_folder_closed.png
+usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_folder_open.png
+usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_config_folder_closed.png
+usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_config_folder_open.png
+usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_folder_closed.png
+usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_folder_open.png
+usr/share/mediatomb/web/icons/nanotree/images/folder_closed.png
+usr/share/mediatomb/web/icons/nanotree/images/folder_open.png
+usr/share/mediatomb/web/icons/nanotree/images/lastnode.png
+usr/share/mediatomb/web/icons/nanotree/images/line.png
+usr/share/mediatomb/web/icons/nanotree/images/minus.png
+usr/share/mediatomb/web/icons/nanotree/images/minus_last.png
+usr/share/mediatomb/web/icons/nanotree/images/minus_last_no_root.png
+usr/share/mediatomb/web/icons/nanotree/images/minus_no_root.png
+usr/share/mediatomb/web/icons/nanotree/images/plus.png
+usr/share/mediatomb/web/icons/nanotree/images/plus_last.png
+usr/share/mediatomb/web/icons/nanotree/images/plus_last_no_root.png
+usr/share/mediatomb/web/icons/nanotree/images/plus_no_root.png
+usr/share/mediatomb/web/icons/nanotree/images/t.png
+usr/share/mediatomb/web/icons/nanotree/images/t_no_root.png
+usr/share/mediatomb/web/icons/nanotree/images/white.png
+usr/share/mediatomb/web/icons/remove_all.png
+usr/share/mediatomb/web/icons/remove_autoscan.png
+usr/share/mediatomb/web/icons/remove_this.png
+usr/share/mediatomb/web/icons/status.png
+usr/share/mediatomb/web/icons/status_loading.png
+usr/share/mediatomb/web/icons/status_updates_pending.png
+usr/share/mediatomb/web/icons/stock-add.png
+usr/share/mediatomb/web/icons/stock_edit.png
+usr/share/mediatomb/web/icons/stock_exit.png
+usr/share/mediatomb/web/index.html
+#usr/share/mediatomb/web/js
+usr/share/mediatomb/web/js/auth.js
+usr/share/mediatomb/web/js/autoscan.js
+usr/share/mediatomb/web/js/icons.js
+usr/share/mediatomb/web/js/iepngfix.htc
+usr/share/mediatomb/web/js/items.js
+usr/share/mediatomb/web/js/md5.js
+usr/share/mediatomb/web/js/nanotree.js
+usr/share/mediatomb/web/js/prototype.js
+usr/share/mediatomb/web/js/tasks.js
+usr/share/mediatomb/web/js/tools.js
+usr/share/mediatomb/web/js/tree.js
+usr/share/mediatomb/web/left.html
+usr/share/mediatomb/web/main.css
+usr/share/mediatomb/web/mr_reg.xml
+usr/share/mediatomb/web/right.html
+usr/share/mediatomb/web/std_treelook.css
+usr/share/mediatomb/web/top.html
+usr/share/mediatomb/web/topleft.html
+usr/share/mediatomb/web/topright.html
+var/ipfire/backup/addons/includes/mediatomb
+var/ipfire/mediatomb
+#var/ipfire/mediatomb/config.xml
+etc/rc.d/init.d/mediatomb
+etc/rc.d/rc0.d/K02mediatomb
+etc/rc.d/rc6.d/K02mediatomb
+etc/rc.d/rc3.d/S98mediatomb
+var/mp3/info
diff --git a/lfs/dnsdist b/lfs/dnsdist
new file mode 100644
index 0000000..70c2975
--- /dev/null
+++ b/lfs/dnsdist
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2015 IPFire Team <info(a)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 = 0.0.498gac688af
+
+THISAPP = dnsdist-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = dnsdist
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = b1bc53b3a35aef7006b74086919847bf
+
+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 axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
+
diff --git a/lfs/linux b/lfs/linux
index e1d6a4e..2f76209 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -132,7 +132,6 @@ ifneq "$(KCFG)" "-headers"
cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
cd $(DIR_APP) && rm localversion-grsec
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel-grsec-compile-fixes.patch
endif
# DVB Patches
@@ -198,6 +197,11 @@ ifeq "$(KCFG)" "-rpi"
cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
endif
+ # Compile fixes
+ifeq "$(KCFG)" "-headers"
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel-grsec-compile-fixes.patch
+endif
+
ifeq "$(KCFG)" "-headers"
# Install the header files
cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install
diff --git a/lfs/lua b/lfs/lua
new file mode 100644
index 0000000..6a6a959
--- /dev/null
+++ b/lfs/lua
@@ -0,0 +1,80 @@
+###############################################################################
+# #
+# 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 = 5.3.0
+
+THISAPP = lua-$(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 = a1b0a7e92d0c85bbff7a8d27bf29f8af
+
+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 axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && cp -v src/luaconf.h src/luaconf.h.template.in
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.3.0-autotoolize.patch
+ cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 46bb3ad..3817986 100755
--- a/make.sh
+++ b/make.sh
@@ -845,6 +845,8 @@ buildipfire() {
ipfiremake swconfig
ipfiremake haproxy
ipfiremake ipset
+ ipfiremake lua
+ ipfiremake dnsdist
}
buildinstaller() {
diff --git a/src/initscripts/init.d/dnsdist b/src/initscripts/init.d/dnsdist
new file mode 100644
index 0000000..03e6ab8
--- /dev/null
+++ b/src/initscripts/init.d/dnsdist
@@ -0,0 +1,46 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/dnsdist
+#
+# Description : dnsdist - A DNS load-balancer and more
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+[ -r "/etc/sysconfig/dnsdist" ] && . /etc/sysconfig/dnsdist
+
+case "${1}" in
+ start)
+ boot_mesg "Starting dnsdist..."
+ loadproc /usr/bin/dnsdist -d ${ARGS}
+ ;;
+
+ stop)
+ boot_mesg "Stopping dnsdist..."
+ killproc /usr/bin/dnsdist
+ ;;
+
+ reload)
+ boot_mesg "Reloading dnsdist..."
+ reloadproc /usr/bin/dnsdist
+ ;;
+
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+
+ status)
+ statusproc /usr/bin/dnsdist
+ ;;
+
+ *)
+ echo "Usage: ${0} {start|stop|reload|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/dnsdist
diff --git a/src/patches/lua-5.3.0-autotoolize.patch b/src/patches/lua-5.3.0-autotoolize.patch
new file mode 100644
index 0000000..3e4723a
--- /dev/null
+++ b/src/patches/lua-5.3.0-autotoolize.patch
@@ -0,0 +1,192 @@
+diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac
+--- lua-5.3.0/configure.ac.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/configure.ac 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.59)
++AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
++AC_SUBST([MAJOR_VERSION], [5.3])
++
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_SRCDIR([src/lapi.c])
++
++AM_INIT_AUTOMAKE([1.9 foreign])
++
++AC_PROG_CC
++AC_PROG_LIBTOOL
++
++AC_ARG_WITH(
++ [readline],
++ [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
++ [use_readline=$withval],
++ [use_readline=yes]
++)
++
++LUA_LIBS="-lm"
++
++# Check for readline
++READLINE_DEFS="#undef LUA_USE_READLINE"
++if test "x$use_readline" == "xyes"; then
++ AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
++ AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
++ if test "x$use_readline" == "xno"; then
++ AC_MSG_WARN([readline headers could not be found, disabling readline support])
++ else
++ READLINE_DEFS="#define LUA_USE_READLINE"
++ READLINE_LIBS="-lreadline -lncurses"
++ fi
++fi
++AC_SUBST(READLINE_DEFS)
++AC_SUBST(READLINE_LIBS)
++
++case "$host" in
++ *-mingw*) use_os=win32 ;;
++ *-darwin*) use_os=macosx ;;
++ *) use_os=posix ;;
++esac
++
++POSIX_DEFS="#undef LUA_USE_POSIX"
++LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
++LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
++
++if test "x$use_os" == "xwin32"; then
++ LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
++elif test "x$use_os" == "xmacosx"; then
++ POSIX_DEFS="#define LUA_USE_POSIX"
++ LUA_DL_DEFS="#define LUA_DL_DYLD"
++elif test "x$use_os" == "xposix"; then
++ POSIX_DEFS="#define LUA_USE_POSIX"
++ LUA_DL_DEFS="#define LUA_DL_DLOPEN"
++ LUA_LIBS="$LUA_LIBS -ldl"
++fi
++AC_SUBST(POSIX_DEFS)
++AC_SUBST(LUA_DL_DEFS)
++AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
++
++AC_SUBST(LUA_LIBS)
++
++AC_CONFIG_FILES([Makefile
++ src/Makefile
++ src/lua.pc
++ src/luaconf.h.template
++ doc/Makefile
++])
++AC_OUTPUT
+diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am
+--- lua-5.3.0/doc/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/doc/Makefile.am 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,4 @@
++man1_MANS = lua.1 luac.1
++
++EXTRA_DIST = \
++ contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
+diff -up lua-5.3.0/Makefile.am.autoxxx lua-5.3.0/Makefile.am
+--- lua-5.3.0/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/Makefile.am 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,3 @@
++SUBDIRS = src doc
++
++EXTRA_DIST = README
+diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore
+--- lua-5.3.0/src/.gitignore.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/src/.gitignore 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,5 @@
++lua
++lua.pc
++luac
++luaconf.h
++luaconf.h.template
+diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.template.in
+--- lua-5.3.0/src/luaconf.h.template.in.autoxxx 2015-01-15 10:20:03.828889562 -0500
++++ lua-5.3.0/src/luaconf.h.template.in 2015-01-15 10:22:37.420027778 -0500
+@@ -11,6 +11,11 @@
+ #include <limits.h>
+ #include <stddef.h>
+
++(a)POSIX_DEFS@
++(a)LUA_DL_DEFS@
++(a)LUA_BUILD_AS_DLL_DEFS@
++(a)READLINE_DEFS@
++
+
+ /*
+ ** ===================================================================
+@@ -175,9 +180,9 @@
+
+ #else /* }{ */
+
+-#define LUA_ROOT "/usr/local/"
+-#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
+-#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
++#define LUA_ROOT "@prefix@/"
++#define LUA_LDIR "@pkgdatadir@/lua/" LUA_VDIR "/"
++#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/"
+ #define LUA_PATH_DEFAULT \
+ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
+diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in
+--- lua-5.3.0/src/lua.pc.in.autoxxx 2015-01-15 10:20:03.827889568 -0500
++++ lua-5.3.0/src/lua.pc.in 2015-01-15 10:20:03.827889568 -0500
+@@ -0,0 +1,13 @@
++V= @MAJOR_VERSION@
++R= @VERSION@
++prefix= @prefix@
++exec_prefix=${prefix}
++libdir= @libdir@
++includedir=${prefix}/include
++
++Name: Lua
++Description: An Extensible Extension Language
++Version: ${R}
++Requires:
++Libs: -llua @LUA_LIBS@
++Cflags: -I${includedir}
+diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am
+--- lua-5.3.0/src/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/src/Makefile.am 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,46 @@
++AM_CFLAGS = -Wall
++
++include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp
++
++nodist_include_HEADERS = luaconf.h
++
++lib_LTLIBRARIES = liblua.la
++liblua_la_LDFLAGS = -release @MAJOR_VERSION@
++liblua_la_SOURCES = \
++ lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
++ ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
++ loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
++ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
++ lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
++ lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
++ lundump.h lvm.h lzio.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = lua.pc
++
++bin_PROGRAMS = lua luac
++
++lua_SOURCES = lua.c
++lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
++lua_DEPENDENCIES = liblua.la
++
++luac_SOURCES = luac.c
++# Statically link liblua against luac since luac uses symbols not exported in liblua
++luac_LDADD = .libs/liblua.a @LUA_LIBS@
++luac_DEPENDENCIES = liblua.la
++
++EXTRA_DIST = luaconf.h.template
++BUILT_SOURCES = luaconf.h
++CLEANFILES = luaconf.h luaconf.h.template
++
++readline_defs = @READLINE_DEFS@
++
++edit = sed \
++ -e 's,%prefix%,$(prefix),g' \
++ -e 's,%lua_datadir%,$(datadir),g' \
++ -e 's,%lua_libdir%,$(libdir),g'
++
++luaconf.h : luaconf.h.template
++ rm -f $@ $@.tmp
++ $(edit) $< >$@.tmp
++ mv $@.tmp $@
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-12-22 22:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151222223115.A883821E7C@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox