[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c8dfe941af2e2b10f3f73929ce56cc0643e1aa8b - IPFire-SCM

9 May 2010

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 3.x development tree".
The branch, master has been updated
       via  c8dfe941af2e2b10f3f73929ce56cc0643e1aa8b (commit)
       via  67f2161936264b27a88801a29fe55e363bd29990 (commit)
       via  eef41b36634cee6c975e6f59130e11896008dfb2 (commit)
       via  f27a388fc970a1b06393d3bb27a24153a2d6055a (commit)
       via  79af96d3a9a8b925fcb39ace3b8be3116c43647f (commit)
      from  d003b60fbbc8e04431cb0f8efa654a5e751ef042 (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 c8dfe941af2e2b10f3f73929ce56cc0643e1aa8b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon May 10 00:51:24 2010 +0200
cmake: New package.
commit 67f2161936264b27a88801a29fe55e363bd29990
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon May 10 00:48:56 2010 +0200
pdns-recursor: Change configdir to /etc/pdns-recursor, was /etc/powerdns.
commit eef41b36634cee6c975e6f59130e11896008dfb2
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon May 10 00:47:28 2010 +0200
pdns-recursor: Remove profiling from CFLAGS.
commit f27a388fc970a1b06393d3bb27a24153a2d6055a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun May 9 22:33:15 2010 +0200
acpid: Apply some configuration to shutdown the system when pressing the power button.
commit 79af96d3a9a8b925fcb39ace3b8be3116c43647f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun May 9 22:20:35 2010 +0200
acpid: New package.
-----------------------------------------------------------------------
Summary of changes:
 pkgs/core/{fuse/fuse.nm => acpid/acpid.nm}         |   28 +++++------
 pkgs/core/acpid/patches/acpid-2.0.2-makefile.patch |   30 ++++++++++++
 pkgs/core/acpid/power                              |    4 ++
 pkgs/core/acpid/power.sh                           |    4 ++
 pkgs/core/{sqlite/sqlite.nm => cmake/cmake.nm}     |   49 ++++++++++++--------
 .../patches/pdns-recursor-fixmakefile.patch        |   19 ++++++++
 .../patches/pdns-recursor-fixsysconfdir.patch      |    9 ++++
 pkgs/core/pdns-recursor/pdns-recursor.nm           |    9 +++-
 8 files changed, 115 insertions(+), 37 deletions(-)
 copy pkgs/core/{fuse/fuse.nm => acpid/acpid.nm} (78%)
 create mode 100644 pkgs/core/acpid/patches/acpid-2.0.2-makefile.patch
 create mode 100644 pkgs/core/acpid/power
 create mode 100755 pkgs/core/acpid/power.sh
 copy pkgs/core/{sqlite/sqlite.nm => cmake/cmake.nm} (62%)
 create mode 100644 pkgs/core/pdns-recursor/patches/pdns-recursor-fixmakefile.patch
 create mode 100644 pkgs/core/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch
Difference in files:

diff --git a/pkgs/core/acpid/acpid.nm b/pkgs/core/acpid/acpid.nm
new file mode 100644
index 0000000..3227be1
--- /dev/null
+++ b/pkgs/core/acpid/acpid.nm
@@ -0,0 +1,51 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include
+
+PKG_NAME       = acpid
+PKG_VER        = 2.0.4
+PKG_REL        = 0
+
+PKG_MAINTAINER =
+PKG_GROUP      = System/Daemons
+PKG_URL        = http://tedfelix.com/linux/acpid-netlink.html
+PKG_LICENSE    = GPLv2+
+PKG_SUMMARY    = ACPI Event Daemon.
+
+define PKG_DESCRIPTION
+	acpid is a daemon that dispatches ACPI events to user-space programs.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.gz
+
+define STAGE_BUILD
+	cd $(DIR_APP) && make CC=gcc RPM_OPT_FLAGS="$(CFLAGS)" $(PARALLLEISMFLAGS)
+endef
+
+define STAGE_INSTALL_CMDS
+	-mkdir -pv $(BUILDROOT)/etc/acpi/{actions,events}
+	cp -vf power $(BUILDROOT)/etc/acpi/events/
+	cp -vf power.sh $(BUILDROOT)/etc/acpi/actions/
+endef
diff --git a/pkgs/core/acpid/patches/acpid-2.0.2-makefile.patch b/pkgs/core/acpid/patches/acpid-2.0.2-makefile.patch
new file mode 100644
index 0000000..0ba9e79
--- /dev/null
+++ b/pkgs/core/acpid/patches/acpid-2.0.2-makefile.patch
@@ -0,0 +1,30 @@
+diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
+diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
+diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
+diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
+diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile
+--- acpid-2.0.2/Makefile.makefile	2010-01-27 00:36:23.000000000 +0100
++++ acpid-2.0.2/Makefile	2010-02-25 16:01:39.641024017 +0100
+@@ -31,8 +31,9 @@ MAN8GZ = $(MAN8:.8=.8.gz)
+ 
+ DOCS = COPYING Changelog README TESTPLAN TODO 
+ 
+-CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE $(OPT) \
+-	-fno-strict-aliasing -g $(DEFS)
++CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE -O2 $(OPT) \
++	-fno-strict-aliasing -g $(DEFS) $(RPM_OPT_FLAGS) -fPIE
++LDFLAGS = -pie -Wl,-z,relro
+ DEFS = -DVERSION=""$(VERSION)""
+ 
+ all: $(PROGS)
+@@ -46,8 +47,8 @@ man: $(MAN8)
+ 
+ install_docs:
+ 	mkdir -p $(DESTDIR)/$(DOCDIR)
+-	for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done
+-	cp -a samples $(DESTDIR)/$(DOCDIR)
++	#for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done
++	#cp -a samples $(DESTDIR)/$(DOCDIR)
+ 
+ install: $(PROGS) man install_docs
+ 	mkdir -p $(DESTDIR)/$(SBINDIR)
diff --git a/pkgs/core/acpid/power b/pkgs/core/acpid/power
new file mode 100644
index 0000000..7406317
--- /dev/null
+++ b/pkgs/core/acpid/power
@@ -0,0 +1,4 @@
+# ACPID config to power down machine if powerbutton is pressed
+
+event=button/power.*
+action=/etc/acpi/actions/power.sh
diff --git a/pkgs/core/acpid/power.sh b/pkgs/core/acpid/power.sh
new file mode 100755
index 0000000..c279e4c
--- /dev/null
+++ b/pkgs/core/acpid/power.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Shutdown the system immediately
+initctl emit shutdown
diff --git a/pkgs/core/cmake/cmake.nm b/pkgs/core/cmake/cmake.nm
new file mode 100644
index 0000000..95982f3
--- /dev/null
+++ b/pkgs/core/cmake/cmake.nm
@@ -0,0 +1,75 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include
+
+PKG_NAME       = cmake
+PKG_VER        = 2.8.1
+PKG_REL        = 0
+
+PKG_MAINTAINER =
+PKG_GROUP      = Development/Tools
+PKG_URL        = http://www.cmake.org
+PKG_LICENSE    = BSD
+PKG_SUMMARY    = Cross-platform make system.
+
+PKG_DEPS      += curl expat ncurses zlib
+
+define PKG_DESCRIPTION
+	CMake is used to control the software compilation process using simple \
+	platform and compiler independent configuration files. CMake generates \
+	native makefiles and workspaces that can be used in the compiler \
+	environment of your choice. CMake is quite sophisticated: it is possible \
+	to support complex environments requiring system configuration, pre-processor \
+	generation, code generation, and template instantiation.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.gz
+
+define STAGE_PREPARE_CMDS
+	# Fixup permissions
+	cd $(DIR_APP) && find -name *.h -o -name *.cxx -print0 | xargs -0 chmod -x
+endef
+
+define STAGE_BUILD
+	-mkdir -pv $(DIR_APP)/build
+	cd $(DIR_APP)/build && \
+		../bootstrap \
+			--prefix=/usr \
+			--datadir=/share/cmake \
+			--docdir=/share/doc/cmake-$(PKG_VER) \
+			--mandir=/share/man \
+			--system-libs \
+			--parallel=$(shell /usr/bin/getconf _NPROCESSORS_ONLN)
+
+	cd $(DIR_APP)/build && make VERBOSE=1 $(PARALLELISMFLAGS)
+endef
+
+define STAGE_TEST
+	cd $(DIR_APP)/build && bin/ctest -V -E ModuleNotices
+endef
+
+define STAGE_INSTALL
+	cd $(DIR_APP)/build && make install DESTDIR=$(BUILDROOT)
+endef
diff --git a/pkgs/core/pdns-recursor/patches/pdns-recursor-fixmakefile.patch b/pkgs/core/pdns-recursor/patches/pdns-recursor-fixmakefile.patch
new file mode 100644
index 0000000..2c39187
--- /dev/null
+++ b/pkgs/core/pdns-recursor/patches/pdns-recursor-fixmakefile.patch
@@ -0,0 +1,19 @@
+diff -up pdns-recursor-3.2-rc2/Makefile.orig pdns-recursor-3.2-rc2/Makefile
+--- pdns-recursor-3.2-rc2/Makefile.orig	2010-03-01 16:52:23.000000000 +0100
++++ pdns-recursor-3.2-rc2/Makefile	2010-03-01 16:53:10.000000000 +0100
+@@ -71,15 +71,12 @@ basic_checks: 
+ install: all
+ 	-mkdir -p $(DESTDIR)/$(SBINDIR)
+ 	mv pdns_recursor $(DESTDIR)/$(SBINDIR)
+-	strip $(DESTDIR)/$(SBINDIR)/pdns_recursor
+ 	mkdir -p $(DESTDIR)/$(BINDIR)
+ 	mv rec_control $(DESTDIR)/$(BINDIR)
+-	strip $(DESTDIR)/$(BINDIR)/rec_control
+ 	-mkdir -p $(DESTDIR)/$(CONFIGDIR)
+ 	$(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist
+ 	-mkdir -p $(DESTDIR)/usr/share/man/man1
+ 	cp pdns_recursor.1 rec_control.1 $(DESTDIR)/usr/share/man/man1
+-	$(OS_SPECIFIC_INSTALL)	
+ 
+ clean: binclean
+ 	-rm -f dep *~ *.gcda *.gcno optional/*.gcda optional/*.gcno
diff --git a/pkgs/core/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch b/pkgs/core/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch
new file mode 100644
index 0000000..1ea6f3f
--- /dev/null
+++ b/pkgs/core/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch
@@ -0,0 +1,9 @@
+diff -up pdns-recursor-3.2-rc2/config.h.orig pdns-recursor-3.2-rc2/config.h
+--- pdns-recursor-3.2-rc2/config.h.orig	2010-03-01 16:54:06.000000000 +0100
++++ pdns-recursor-3.2-rc2/config.h	2010-03-01 16:54:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-#define SYSCONFDIR "/etc/powerdns/" 
++#define SYSCONFDIR "/etc/pdns-recursor/" 
+ #define LOCALSTATEDIR "/var/run/" 
+ #define VERSION "3.2"
+ #define RECURSOR
diff --git a/pkgs/core/pdns-recursor/pdns-recursor.nm b/pkgs/core/pdns-recursor/pdns-recursor.nm
index 1ce372f..08a5986 100644
--- a/pkgs/core/pdns-recursor/pdns-recursor.nm
+++ b/pkgs/core/pdns-recursor/pdns-recursor.nm
@@ -45,9 +45,14 @@ PKG_TARBALL    = $(THISAPP).tar.bz2
define STAGE_BUILD
    cd $(DIR_APP) && LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua \
-		make OPTFLAGS="$(CFLAGS)" PROFILEFLAGS=-fprofile-use #$(PARALLELISMFLAGS)
+		make OPTFLAGS="$(CFLAGS)" #$(PARALLELISMFLAGS)
 endef
-define STAGE_INSTALL_CMDS
+define STAGE_INSTALL
+	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \
+		CONFIGDIR=/etc/$(PKG_NAME)
+
    rm -rf $(BUILDROOT)/etc/init.d
+
+	mv -v $(BUILDROOT)/etc/$(PKG_NAME)/recursor.conf{-dist,}
 endef
hooks/post-receive
--
IPFire 3.x development tree

    