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 c181a580062ede13236666e34f5935eee4f95e0c (commit) via a838f0eb226e9c51c5964088a79ac7407dbaa391 (commit) via a10c58dc50d5f894241c48596dcd714a4b49781e (commit) via 31e26e4b83940e895104a20811aa3cbf450140b3 (commit) via edaf384049fffcc7ebf5e8af4edb3e9aea059c5e (commit) via ff4bdfdedf83c8e9a3c2dd5366cb48a1e7f962c7 (commit) via 96fb24e2d74d2abdacc9e90dab337662c0b3a51a (commit) via 359102ae4e229acadb6b27c011d10e903c4b2ce9 (commit) via cc99ea7fceef17e19f8edd501e1f5e652069ba0c (commit) via f3a7837050936f9c7b0f457c52d1caaab41b1370 (commit) via 2de87f7b38388106ddc17c57f54037ab6573daba (commit) via 96f99b9e70f2514604803c99fe1b384b3ad2c697 (commit) from df4ac56499194c0fe513ab746a62368e69ad7657 (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 c181a580062ede13236666e34f5935eee4f95e0c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 9 23:11:52 2011 +0100
gnutls: Update to 3.0.7.
Fixes a possible security issue.
commit a838f0eb226e9c51c5964088a79ac7407dbaa391 Merge: a10c58d edaf384 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 9 19:46:15 2011 +0100
Merge remote-tracking branch 'stevee/fixes'
commit a10c58dc50d5f894241c48596dcd714a4b49781e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 9 19:37:28 2011 +0100
util-linux: Update to 2.20.
commit 31e26e4b83940e895104a20811aa3cbf450140b3 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Nov 9 19:33:41 2011 +0100
sysvinit: Remove mountpoint which is provided by util-linux.
commit edaf384049fffcc7ebf5e8af4edb3e9aea059c5e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Nov 6 13:25:25 2011 +0100
python-piksemel: Fix typo and broken build.
commit ff4bdfdedf83c8e9a3c2dd5366cb48a1e7f962c7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Nov 6 13:24:39 2011 +0100
python-qtermwidget: Fix build dependencies.
Add libX11-devel and libXext-devel as build dependencies.
commit 96fb24e2d74d2abdacc9e90dab337662c0b3a51a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Nov 6 13:22:14 2011 +0100
python-pyblock: Requires at least dmraid-devel>=1.0.0.rc15 / fix package name.
The old dmraid-devel package doesn't contain any header files, so the build was brocken.
Fix name of the final created package from pyblock to python-pyblock.
commit 359102ae4e229acadb6b27c011d10e903c4b2ce9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Nov 6 13:18:39 2011 +0100
dmraid: Also install header files.
commit cc99ea7fceef17e19f8edd501e1f5e652069ba0c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Nov 6 13:17:30 2011 +0100
pyQt: Add gettext support.
commit f3a7837050936f9c7b0f457c52d1caaab41b1370 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Nov 5 19:07:58 2011 +0100
pyQt: Update to 4.8.6.
commit 2de87f7b38388106ddc17c57f54037ab6573daba Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Nov 5 18:58:33 2011 +0100
pyQt: Fix build error.
Added libX11-devel as build dep to fix linker error.
commit 96f99b9e70f2514604803c99fe1b384b3ad2c697 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Nov 5 18:57:05 2011 +0100
sip: Update to 4.13.
-----------------------------------------------------------------------
Summary of changes: dmraid/dmraid.nm | 11 ++- gnutls/gnutls.nm | 4 +- pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch | 23 ----- pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch | 19 ---- .../PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch | 12 --- pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch | 8 ++ pyQt/patches/add_gettext_support.patch0 | 89 ++++++++++++++++++++ pyQt/pyQt.nm | 9 +- python-piksemel/python-piksemel.nm | 2 +- python-pyblock/python-pyblock.nm | 6 +- python-qtermwidget/python-qtermwidget.nm | 4 +- sip/sip.nm | 2 +- sysvinit/sysvinit.nm | 6 +- util-linux/util-linux.nm | 7 +- 14 files changed, 128 insertions(+), 74 deletions(-) delete mode 100644 pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch delete mode 100644 pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch delete mode 100644 pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch create mode 100644 pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch create mode 100644 pyQt/patches/add_gettext_support.patch0
Difference in files: diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm index e017e19..5b7e58b 100644 --- a/dmraid/dmraid.nm +++ b/dmraid/dmraid.nm @@ -5,7 +5,7 @@
name = dmraid version = 1.0.0.rc15 -release = 1 +release = 2
groups = System/Filesystems url = http://people.redhat.com/heinzm/sw/dmraid @@ -13,12 +13,12 @@ license = GPLv2+ summary = Device-mapper RAID tool and library.
description - DMRAID supports RAID device discovery, RAID set activation, creation, \ - removal, rebuild and display of properties for ATARAID/DDF1 metadata on \ + DMRAID supports RAID device discovery, RAID set activation, creation, + removal, rebuild and display of properties for ATARAID/DDF1 metadata on Linux >= 2.4 using device-mapper. end
-source_dl = +source_dl = http://people.redhat.com/heinzm/sw/dmraid/src/old/ sources = %{thisapp}.tar.bz2
build @@ -48,6 +48,9 @@ build install -v -m 755 lib/libdmraid.so \ %{BUILDROOT}/lib/libdmraid.so.%{version} ln -svf ../../lib/libdmraid.so.%{version} %{BUILDROOT}/usr/lib/libdmraid.so + + # Install development headers. + install -m 644 include/dmraid/*.h %{BUILDROOT}/usr/include/dmraid/ end end
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index dadca53..fd5772d 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -4,8 +4,8 @@ ###############################################################################
name = gnutls -version = 3.0.4 -release = 2 +version = 3.0.7 +release = 1
groups = System/Libraries url = http://www.gnu.org/software/gnutls/ diff --git a/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch b/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch deleted file mode 100644 index 0e52885..0000000 --- a/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up PyQt-x11-gpl-4.4.4/configure.py.64bit PyQt-x11-gpl-4.4.4/configure.py ---- PyQt-x11-gpl-4.4.4/configure.py.64bit 2008-11-08 05:55:49.000000000 -0600 -+++ PyQt-x11-gpl-4.4.4/configure.py 2008-11-10 14:01:14.000000000 -0600 -@@ -756,16 +756,15 @@ include(%s) - else: - # Use distutils to get the additional configuration. - from distutils.sysconfig import get_config_vars -+ from distutils.sysconfig import get_python_lib - ducfg = get_config_vars() - - if sys.platform == "darwin": - # We need to work out how to specify the right framework - # version. - link = "-framework Python" -- elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and -- glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))): -- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) -- link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor) -+ elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ): -+ link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor) - else: - sipconfig.inform("Qt Designer plugin disabled because Python library is static") - opts.designer_plugin = False diff --git a/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch b/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch deleted file mode 100644 index cfd86d6..0000000 --- a/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED PyQt-x11-gpl-4.5.2/configure.py ---- PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED 2009-07-16 08:34:48.419358104 -0500 -+++ PyQt-x11-gpl-4.5.2/configure.py 2009-07-16 08:34:54.260358064 -0500 -@@ -1679,11 +1679,11 @@ int main(int, char **) - - out << QLibraryInfo::licensee() << '\n'; - --#if defined(QT_SHARED) || defined(QT_DLL) -+//#if defined(QT_SHARED) || defined(QT_DLL) - out << "shared\n"; --#else -- out << "\n"; --#endif -+//#else -+// out << "\n"; -+//#endif - - // Determine which features should be disabled. - diff --git a/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch b/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch deleted file mode 100644 index 2d73acd..0000000 --- a/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking PyQt-x11-gpl-4.7.2/configure.py ---- PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking 2010-03-18 07:08:13.000000000 -0500 -+++ PyQt-x11-gpl-4.7.2/configure.py 2010-03-18 07:09:46.157734414 -0500 -@@ -1173,7 +1173,7 @@ def compile_qt_program(name, mname, extr - opengl = (mname == "QtOpenGL") - - qt = [mname] -- if mname in ("QtOpenGL", "QtWebKit"): -+ if mname in ("QtOpenGL", "QtWebKit", "QtAssistant", "QtHelp"): - qt.append("QtCore") - - makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, diff --git a/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch b/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch new file mode 100644 index 0000000..58a64f6 --- /dev/null +++ b/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch @@ -0,0 +1,8 @@ +diff -up PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py.pyuic_shbang PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py +--- PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py.pyuic_shbang 2011-01-14 21:44:29.000000000 -0600 ++++ PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py 2011-01-15 08:56:58.371972273 -0600 +@@ -1,3 +1,4 @@ ++#!/usr/bin/python -tt + ############################################################################# + ## + ## Copyright (c) 2011 Riverbank Computing Limited info@riverbankcomputing.com diff --git a/pyQt/patches/add_gettext_support.patch0 b/pyQt/patches/add_gettext_support.patch0 new file mode 100644 index 0000000..4e81312 --- /dev/null +++ b/pyQt/patches/add_gettext_support.patch0 @@ -0,0 +1,89 @@ +Index: pyuic/uic/driver.py +=================================================================== +--- pyuic/uic/driver.py.orig ++++ pyuic/uic/driver.py +@@ -2,7 +2,19 @@ import sys + import logging + + from PyQt4.uic import compileUi, loadUi ++from PyQt4.uic.Compiler import qtproxies + ++original_i18n_string = qtproxies.i18n_string ++class i18n_string(qtproxies.i18n_string): ++ def __init__(self, string, disambig=None): ++ original_i18n_string.__init__(self, string, disambig) ++ def __str__(self): ++ return "i18n(%s)" % (qtproxies.as_string(self.string, encode=False),) ++ ++_gettext_header = """import gettext ++__trans = gettext.translation('%s', fallback=True) ++i18n = __trans.ugettext ++""" + + class Driver(object): + """ This encapsulates access to the pyuic functionality so that it can be +@@ -16,6 +28,8 @@ class Driver(object): + name of the .ui file. + """ + ++ self.gettext_header = '' ++ + if opts.debug: + logger = logging.getLogger(self.LOGGER_NAME) + handler = logging.StreamHandler() +@@ -23,6 +37,10 @@ class Driver(object): + logger.addHandler(handler) + logger.setLevel(logging.DEBUG) + ++ if not opts.gettext_domain == '': ++ qtproxies.i18n_string = i18n_string ++ self.gettext_header = _gettext_header % opts.gettext_domain ++ + self._opts = opts + self._ui_file = ui_file + +@@ -60,7 +78,7 @@ class Driver(object): + pyfile = open(self._opts.output, 'wt', encoding='utf8') + + compileUi(self._ui_file, pyfile, self._opts.execute, self._opts.indent, +- self._opts.pyqt3_wrapper, self._opts.from_imports) ++ self._opts.pyqt3_wrapper, self._opts.from_imports, self.gettext_header) + + def on_IOError(self, e): + """ Handle an IOError exception. """ +Index: pyuic/uic/__init__.py +=================================================================== +--- pyuic/uic/__init__.py.orig ++++ pyuic/uic/__init__.py +@@ -98,7 +98,7 @@ def compileUiDir(dir, recurse=False, map + compile_ui(dir, ui) + + +-def compileUi(uifile, pyfile, execute=False, indent=4, pyqt3_wrapper=False, from_imports=False): ++def compileUi(uifile, pyfile, execute=False, indent=4, pyqt3_wrapper=False, from_imports=False, additional_text=''): + """compileUi(uifile, pyfile, execute=False, indent=4, pyqt3_wrapper=False, from_imports=False) + + Creates a Python module from a Qt Designer .ui file. +@@ -127,6 +127,9 @@ def compileUi(uifile, pyfile, execute=Fa + + pyfile.write(_header % (uifname, ctime(), PYQT_VERSION_STR)) + ++ if not additional_text == '': ++ pyfile.write(additional_text) ++ + winfo = compiler.UICompiler().compileUi(uifile, pyfile, from_imports) + + if pyqt3_wrapper: +Index: pyuic/uic/pyuic.py +=================================================================== +--- pyuic/uic/pyuic.py.orig ++++ pyuic/uic/pyuic.py +@@ -26,6 +26,8 @@ parser.add_option("-x", "--execute", des + help="generate extra code to test and display the class") + parser.add_option("-d", "--debug", dest="debug", action="store_true", + default=False, help="show debug output") ++parser.add_option("-g", "--use-gettext", dest="gettext_domain", action="store", type="str", ++ default='', help="use gettext for following domain") + parser.add_option("-i", "--indent", dest="indent", action="store", type="int", + default=4, metavar="N", + help="set indent width to N spaces, tab if N is 0 (default: 4)") diff --git a/pyQt/pyQt.nm b/pyQt/pyQt.nm index f553a1b..513e2cb 100644 --- a/pyQt/pyQt.nm +++ b/pyQt/pyQt.nm @@ -4,8 +4,8 @@ ###############################################################################
name = pyQt -version = 4.8.1 -release = 1 +version = 4.8.6 +release = 2 epoch = 0
groups = Development/Languages @@ -17,16 +17,17 @@ description Python bindings for Qt4 end
-source_dl = +source_dl = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/ sources = PyQt-x11-gpl-%{version}.tar.gz
build requires gcc-c++ + libX11-devel libXext-devel python-devel qt-devel - sip-devel + sip-devel>=4.13 end
DIR_APP = %{DIR_SRC}/PyQt-x11-gpl-%{version} diff --git a/python-piksemel/python-piksemel.nm b/python-piksemel/python-piksemel.nm index d9a46b5..c85cf9c 100644 --- a/python-piksemel/python-piksemel.nm +++ b/python-piksemel/python-piksemel.nm @@ -20,7 +20,7 @@ end source_dl =
build - reqires + requires python-devel end
diff --git a/python-pyblock/python-pyblock.nm b/python-pyblock/python-pyblock.nm index 109122c..de70bbb 100644 --- a/python-pyblock/python-pyblock.nm +++ b/python-pyblock/python-pyblock.nm @@ -5,7 +5,7 @@
name = pyblock version = 0.46 -release = 1 +release = 2
groups = System/Libraries url = http://git.fedorahosted.org/git/?p=pyblock.git;a=summary @@ -21,7 +21,7 @@ sources = %{thisapp}.tar.bz2
build requires - dmraid-devel + dmraid-devel>=1.0.0.rc15-2 libdevmapper-devel libselinux-devel python-devel @@ -42,5 +42,5 @@ build end
packages - package %{name} + package python-%{name} end diff --git a/python-qtermwidget/python-qtermwidget.nm b/python-qtermwidget/python-qtermwidget.nm index bd8c2a3..e1bd394 100644 --- a/python-qtermwidget/python-qtermwidget.nm +++ b/python-qtermwidget/python-qtermwidget.nm @@ -5,7 +5,7 @@
name = python-qtermwidget version = 0.1.2 -release = 1 +release = 2
groups = Development/Languages url = http://code.google.com/p/pyqt4-extrawidgets/downloads/list @@ -22,6 +22,8 @@ sources = qtermwidget-%{version}.tar.gz build requires gcc-c++ + libX11-devel + libXext-devel pyQt pyQt-devel python-devel diff --git a/sip/sip.nm b/sip/sip.nm index d00867f..5fe790c 100644 --- a/sip/sip.nm +++ b/sip/sip.nm @@ -4,7 +4,7 @@ ###############################################################################
name = sip -version = 4.12-snapshot-12acbffd0085 +version = %{major_ver}.13 major_ver = 4 release = 1 epoch = 1 diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm index 0a4a301..50a23e0 100644 --- a/sysvinit/sysvinit.nm +++ b/sysvinit/sysvinit.nm @@ -5,7 +5,7 @@
name = sysvinit version = 2.86 -release = 2 +release = 3
groups = System/Base url = https://alioth.debian.org/projects/pkg-sysvinit/ @@ -35,6 +35,10 @@ build mkdir -pv %{BUILDROOT}/{bin,sbin,usr/{bin,include}} mkdir -pv %{BUILDROOT}/usr/share/man/man{1,5,8} make -C src install ROOT=%{BUILDROOT} + + # /bin/mountpoint is part of util-linux >= 2.20 + rm -vf %{BUILDROOT}/bin/mountpoint \ + %{BUILDROOT}/usr/share/man/man1/mountpoint.1 end end
diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 36ab421..7c1c558 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -4,9 +4,9 @@ ###############################################################################
name = util-linux -version = 2.19 -major_ver = 2.19 -release = 7 +major_ver = 2.20 +version = %{major_ver} +release = 1
groups = System/Base url = http://kernel.org/~kzak/util-linux/ @@ -103,6 +103,7 @@ packages conflicts setup<3.0-2 util-linux-ng + sysvinit<=2.86-2 end
preprequires += coreutils
hooks/post-receive -- IPFire 3.x development tree