From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 55fa19b0fed06561253e8c0faaa68e5607d8bcb1
Date: Sat, 20 Oct 2012 10:59:57 +0200 [thread overview]
Message-ID: <20121020085958.5160A20133@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 16390 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, thirteen has been updated
via 55fa19b0fed06561253e8c0faaa68e5607d8bcb1 (commit)
via 58ca93ccba8d26feb00304e5b289da0d7305226a (commit)
via 0adb55f28b4e4121b1f21faf0824a04615acbbf4 (commit)
from 0f18c3088fc531e1b41ea54682a15dee4bf64730 (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 55fa19b0fed06561253e8c0faaa68e5607d8bcb1
Merge: 58ca93c 0f18c30
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 20 10:59:50 2012 +0200
Merge remote-tracking branch 'origin/thirteen' into thirteen
commit 58ca93ccba8d26feb00304e5b289da0d7305226a
Merge: 0adb55f 98f2c8b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 18 21:45:54 2012 +0200
Merge remote-tracking branch 'origin/thirteen' into thirteen
commit 0adb55f28b4e4121b1f21faf0824a04615acbbf4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 18 21:45:11 2012 +0200
pakfire3: New package.
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/pakfire3 | 1 +
config/rootfiles/packages/pakfire3 | 118 +++++++++++++++++++++++++
lfs/{streamripper => pakfire3} | 26 +++---
lfs/pakfire3-deps | 56 ------------
make.sh | 2 +-
src/patches/pakfire3-changes-for-ipfire2.diff | 35 +++++++
6 files changed, 170 insertions(+), 68 deletions(-)
create mode 100644 config/backup/includes/pakfire3
create mode 100644 config/rootfiles/packages/pakfire3
copy lfs/{streamripper => pakfire3} (84%)
delete mode 100644 lfs/pakfire3-deps
create mode 100644 src/patches/pakfire3-changes-for-ipfire2.diff
Difference in files:
diff --git a/config/backup/includes/pakfire3 b/config/backup/includes/pakfire3
new file mode 100644
index 0000000..404e92c
--- /dev/null
+++ b/config/backup/includes/pakfire3
@@ -0,0 +1 @@
+/etc/pakfire
diff --git a/config/rootfiles/packages/pakfire3 b/config/rootfiles/packages/pakfire3
new file mode 100644
index 0000000..effabc8
--- /dev/null
+++ b/config/rootfiles/packages/pakfire3
@@ -0,0 +1,118 @@
+#etc/pakfire
+etc/pakfire/builder.conf
+etc/pakfire/client.conf
+etc/pakfire/daemon.conf
+etc/pakfire/distros
+etc/pakfire/distros/ipfire3.conf
+etc/pakfire/general.conf
+etc/pakfire/repos
+usr/bin/pakfire-builder
+usr/bin/pakfire-client
+usr/bin/pakfire-daemon
+usr/bin/pakfire-key
+usr/bin/pakfire-server
+usr/lib/libpakfire_preload.so
+usr/lib/pakfire
+usr/lib/pakfire/builder
+usr/lib/pakfire/chroot-shell
+usr/lib/pakfire/cleanup
+usr/lib/pakfire/compress-man-pages
+usr/lib/pakfire/extract-debuginfo
+usr/lib/pakfire/find-common
+usr/lib/pakfire/find-prerequires
+usr/lib/pakfire/find-provides
+usr/lib/pakfire/find-requires
+usr/lib/pakfire/functions-common
+usr/lib/pakfire/functions-constants
+usr/lib/pakfire/functions-directories
+usr/lib/pakfire/functions-files
+usr/lib/pakfire/functions-lists
+usr/lib/pakfire/functions-logging
+usr/lib/pakfire/macros
+usr/lib/pakfire/macros/arch.macro
+usr/lib/pakfire/macros/build.macro
+usr/lib/pakfire/macros/cflags.macro
+usr/lib/pakfire/macros/constants.macro
+usr/lib/pakfire/macros/package-default.macro
+usr/lib/pakfire/macros/quality-agent.macro
+usr/lib/pakfire/macros/systemd.macro
+usr/lib/pakfire/macros/templates.macro
+usr/lib/pakfire/pakfire-multicall.py
+usr/lib/pakfire/patch
+usr/lib/pakfire/perl.prov
+usr/lib/pakfire/perl.req
+usr/lib/pakfire/py-compile
+usr/lib/pakfire/quality-agent
+usr/lib/pakfire/remove-static-libs
+usr/lib/python2.7/site-packages/pakfire
+usr/lib/python2.7/site-packages/pakfire/__init__.py
+usr/lib/python2.7/site-packages/pakfire/__version__.py
+usr/lib/python2.7/site-packages/pakfire/_lzma.so
+usr/lib/python2.7/site-packages/pakfire/_pakfire.so
+usr/lib/python2.7/site-packages/pakfire/actions.py
+usr/lib/python2.7/site-packages/pakfire/api.py
+usr/lib/python2.7/site-packages/pakfire/base.py
+usr/lib/python2.7/site-packages/pakfire/builder.py
+usr/lib/python2.7/site-packages/pakfire/cgroup.py
+usr/lib/python2.7/site-packages/pakfire/chroot.py
+usr/lib/python2.7/site-packages/pakfire/cli.py
+usr/lib/python2.7/site-packages/pakfire/client
+usr/lib/python2.7/site-packages/pakfire/client/__init__.py
+usr/lib/python2.7/site-packages/pakfire/client/base.py
+usr/lib/python2.7/site-packages/pakfire/client/builder.py
+usr/lib/python2.7/site-packages/pakfire/client/test.py
+usr/lib/python2.7/site-packages/pakfire/client/transport.py
+usr/lib/python2.7/site-packages/pakfire/compress.py
+usr/lib/python2.7/site-packages/pakfire/config.py
+usr/lib/python2.7/site-packages/pakfire/constants.py
+usr/lib/python2.7/site-packages/pakfire/distro.py
+usr/lib/python2.7/site-packages/pakfire/downloader.py
+usr/lib/python2.7/site-packages/pakfire/errors.py
+usr/lib/python2.7/site-packages/pakfire/filelist.py
+usr/lib/python2.7/site-packages/pakfire/i18n.py
+usr/lib/python2.7/site-packages/pakfire/keyring.py
+usr/lib/python2.7/site-packages/pakfire/logger.py
+usr/lib/python2.7/site-packages/pakfire/lzma.py
+usr/lib/python2.7/site-packages/pakfire/packages
+usr/lib/python2.7/site-packages/pakfire/packages/__init__.py
+usr/lib/python2.7/site-packages/pakfire/packages/base.py
+usr/lib/python2.7/site-packages/pakfire/packages/file.py
+usr/lib/python2.7/site-packages/pakfire/packages/installed.py
+usr/lib/python2.7/site-packages/pakfire/packages/lexer.py
+usr/lib/python2.7/site-packages/pakfire/packages/make.py
+usr/lib/python2.7/site-packages/pakfire/packages/packager.py
+usr/lib/python2.7/site-packages/pakfire/packages/solv.py
+usr/lib/python2.7/site-packages/pakfire/repository
+usr/lib/python2.7/site-packages/pakfire/repository/__init__.py
+usr/lib/python2.7/site-packages/pakfire/repository/base.py
+usr/lib/python2.7/site-packages/pakfire/repository/cache.py
+usr/lib/python2.7/site-packages/pakfire/repository/database.py
+usr/lib/python2.7/site-packages/pakfire/repository/index.py
+usr/lib/python2.7/site-packages/pakfire/repository/local.py
+usr/lib/python2.7/site-packages/pakfire/repository/metadata.py
+usr/lib/python2.7/site-packages/pakfire/repository/remote.py
+usr/lib/python2.7/site-packages/pakfire/repository/system.py
+usr/lib/python2.7/site-packages/pakfire/satsolver.py
+usr/lib/python2.7/site-packages/pakfire/server.py
+usr/lib/python2.7/site-packages/pakfire/system.py
+usr/lib/python2.7/site-packages/pakfire/transaction.py
+usr/lib/python2.7/site-packages/pakfire/util.py
+usr/lib/quality-agent
+usr/lib/quality-agent/001-include-files
+usr/lib/quality-agent/001-remove-info-files
+usr/lib/quality-agent/001-unsafe-files
+usr/lib/quality-agent/002-bad-symlinks
+usr/lib/quality-agent/003-libs-location
+usr/lib/quality-agent/050-canary
+usr/lib/quality-agent/050-execstacks
+usr/lib/quality-agent/050-invalid-interpreters
+usr/lib/quality-agent/050-libs-needed
+usr/lib/quality-agent/050-libs-soname
+usr/lib/quality-agent/050-libs-x86_64
+usr/lib/quality-agent/050-nx
+usr/lib/quality-agent/050-relro
+usr/lib/quality-agent/050-rpaths
+usr/lib/quality-agent/090-python-hardlinks
+usr/lib/quality-agent/095-directory-layout
+usr/lib/quality-agent/qa-include
+var/ipfire/backup/addons/includes/pakfire3
diff --git a/lfs/pakfire3 b/lfs/pakfire3
new file mode 100644
index 0000000..a0e19dd
--- /dev/null
+++ b/lfs/pakfire3
@@ -0,0 +1,88 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2010 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.9.23
+
+THISAPP = pakfire-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = http://source.ipfire.org/releases/pakfire/
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = pakfire3
+PAK_VER = 1
+
+DEPS = "libsatsolver pycurl python-progressbar python-xattr sqlite urlgrabber"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 10e6dd51c917faa8bd2e7435495de211
+
+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) && patch -Np1 < $(DIR_SRC)/src/patches/pakfire3-changes-for-ipfire2.diff
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ rm -vf /usr/bin/pakfire3
+
+ install -v -m 644 $(DIR_SRC)/config/backup/includes/pakfire3 \
+ /var/ipfire/backup/addons/includes/pakfire3
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/pakfire3-deps b/lfs/pakfire3-deps
deleted file mode 100644
index 1403a81..0000000
--- a/lfs/pakfire3-deps
+++ /dev/null
@@ -1,56 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 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
-
-THISAPP = pakfire3-deps
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = pakfire3-deps
-PAK_VER = 2
-DEPS = "intltool git make libsatsolver pycurl python-satsolver python-distutils python-distutils-extra python-lzma python-progressbar python-xattr sqlite urlgrabber"
-
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-dist:
- @$(PAK)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- #Create a file for the package. Because empty rootfile will break.
- echo "# Pakfire 3 deps is installed" > /var/ipfire/pakfire3-deps
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 25958f8..208ddf6 100755
--- a/make.sh
+++ b/make.sh
@@ -737,7 +737,6 @@ buildipfire() {
ipfiremake python-progressbar
ipfiremake python-xattr
ipfiremake intltool
- ipfiremake pakfire3-deps
ipfiremake transmission
ipfiremake dpfhack
ipfiremake lcd4linux
@@ -751,6 +750,7 @@ buildipfire() {
ipfiremake libassuan
ipfiremake gpgme
ipfiremake pygpgme
+ ipfiremake pakfire3
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
diff --git a/src/patches/pakfire3-changes-for-ipfire2.diff b/src/patches/pakfire3-changes-for-ipfire2.diff
new file mode 100644
index 0000000..e0f476a
--- /dev/null
+++ b/src/patches/pakfire3-changes-for-ipfire2.diff
@@ -0,0 +1,35 @@
+diff --git a/Makefile b/Makefile
+index 0361af6..0bcb1bf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+
+ include Makeconfig
+
+-SUBDIRS = po python tools tools/fake-environ
++SUBDIRS = python tools tools/fake-environ
+
+ all: build
+
+diff --git a/tools/Makefile b/tools/Makefile
+index d7cbf70..499beb4 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -12,7 +12,7 @@ LIBS_POPT = -lpopt
+
+ SCRIPTS = $(SCRIPTS_BIN) $(SCRIPTS_SHELL)
+ SCRIPTS_BIN = \
+- debugedit
++ #debugedit
+
+ SCRIPTS_SHELL = \
+ chroot-shell \
+@@ -50,7 +50,7 @@ install: $(SCRIPTS)
+
+ # Create script aliases.
+ -mkdir -pv $(DESTDIR)/usr/bin
+- ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire
++ ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire3
+ ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire-builder
+ ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire-client
+ ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire-daemon
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-10-20 8:59 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=20121020085958.5160A20133@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