From c4c95d0a83531a5b15e23e0a13a3ec07a0297681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 18 May 2015 10:35:55 +0300 Subject: [PATCH 1/2] dbus-python move --- circle_and_problems_in_core.txt | 45 ++++--- system/base/dbus-python/actions.py | 49 -------- .../dbus-python/files/suppress-warnings.patch | 12 -- system/base/dbus-python/pspec.xml | 117 ------------------ system/base/dbus-python/translations.xml | 7 -- 5 files changed, 22 insertions(+), 208 deletions(-) delete mode 100644 system/base/dbus-python/actions.py delete mode 100644 system/base/dbus-python/files/suppress-warnings.patch delete mode 100644 system/base/dbus-python/pspec.xml delete mode 100644 system/base/dbus-python/translations.xml diff --git a/circle_and_problems_in_core.txt b/circle_and_problems_in_core.txt index d148168a..0d6d917f 100644 --- a/circle_and_problems_in_core.txt +++ b/circle_and_problems_in_core.txt @@ -1,26 +1,25 @@ - (0001/182) Calculating build dep of busybox (0002/182) Calculating build dep of libuser (0003/182) Calculating build dep of less (0004/182) Calculating build dep of libpipeline (0005/182) Calculating build dep of liblogging (0006/182) Calculating build dep of alternatives (0007/182) Calculating build dep of kbd (0008/182) Calculating build dep of spidermonkey ---> borks in 'libX11-devel' - (0009/182) Calculating build dep of sysvinit (0010/182) Calculating build dep of gc (0011/182) Calculating build dep of findutils (0012/182) Calculating build dep of rsyslog (0013/182) Calculating build dep of popt (0014/182) Calculating build dep of gdbm (0015/182) Calculating build dep of python-pyliblzma (0016/182) Calculating build dep of cython (0017/182) Calculating build dep of pisilinux-python (0018/182) Calculating build dep of mingetty (0019/182) Calculating build dep of scons (0020/182) Calculating build dep of grub2 (0021/182) Calculating build dep of snappy (0022/182) Calculating build dep of gnuconfig (0023/182) Calculating build dep of os-prober (0024/182) Calculating build dep of gmp (0025/182) Calculating build dep of baselayout (0026/182) Calculating build dep of flex (0027/182) Calculating build dep of python-setuptools (0028/182) Calculating build dep of unzip (0029/182) Calculating build dep of libusb-compat (0030/182) Calculating build dep of python ---> borks in 'libX11-devel' - (0031/182) Calculating build dep of libidn (0032/182) Calculating build dep of db (0033/182) Calculating build dep of cpio (0034/182) Calculating build dep of ca-certificates (0035/182) Calculating build dep of lzo (0036/182) Calculating build dep of libseccomp (0037/182) Calculating build dep of shadow (0038/182) Calculating build dep of util-linux (0039/182) Calculating build dep of dhcpcd (0040/182) Calculating build dep of pycurl (0041/182) Calculating build dep of python-psutil (0042/182) Calculating build dep of nspr (0043/182) Calculating build dep of dbus ---> borks in 'libX11-devel' - (0044/182) Calculating build dep of numactl (0045/182) Calculating build dep of comar-api (0046/182) Calculating build dep of patch (0047/182) Calculating build dep of psmisc (0048/182) Calculating build dep of bison (0049/182) Calculating build dep of net-tools (0050/182) Calculating build dep of help2man (0051/182) Calculating build dep of man-pages ---> borks in 'libX11-devel' - (0052/182) Calculating build dep of mkinitramfs ---> borks in 'colorgcc' - (0053/182) Calculating build dep of kernel (0054/182) Calculating build dep of json-c (0055/182) Calculating build dep of yacc (0056/182) Calculating build dep of util-macros (0057/182) Calculating build dep of sed ---> borks in 'libxslt' - (0058/182) Calculating build dep of intltool (0059/182) Calculating build dep of tcp-wrappers (0060/182) Calculating build dep of gperftools (0061/182) Calculating build dep of mdadm (0062/182) Calculating build dep of klibc (0063/182) Calculating build dep of mailcap (0064/182) Calculating build dep of kmod (0065/182) Calculating build dep of nss-mdns (0066/182) Calculating build dep of pisi (0067/182) Calculating build dep of libunistring (0068/182) Calculating build dep of glibc ---> borks in 'libxslt' - (0069/182) Calculating build dep of libestr (0070/182) Calculating build dep of piksemel (0071/182) Calculating build dep of automake ---> borks in 'libxslt' - (0072/182) Calculating build dep of miscfiles (0073/182) Calculating build dep of linux-firmware (0074/182) Calculating build dep of run-parts (0075/182) Calculating build dep of libpng (0076/182) Calculating build dep of disktype ---> borks in 'colorgcc' - (0077/182) Calculating build dep of bc (0078/182) Calculating build dep of v86d (0079/182) Calculating build dep of gawk ---> borks in 'libX11-devel' - (0080/182) Calculating build dep of libgcrypt (0081/182) Calculating build dep of bash (0082/182) Calculating build dep of eudev (0083/182) Calculating build dep of docbook-xml (0084/182) Calculating build dep of pcmciautils (0085/182) Calculating build dep of openssl (0086/182) Calculating build dep of acl ---> borks in 'libX11-devel' - (0087/182) Calculating build dep of guile (0088/182) Calculating build dep of glib2 (0089/182) Calculating build dep of binutils (0090/182) Calculating build dep of ppl (0091/182) Calculating build dep of cryptsetup ---> borks in 'libX11-devel' - (0092/182) Calculating build dep of sgml-common (0093/182) Calculating build dep of lvm2 (0094/182) Calculating build dep of perl-XML-Parser (0095/182) Calculating build dep of libatomic_ops (0096/182) Calculating build dep of isl (0097/182) Calculating build dep of xz (0098/182) Calculating build dep of ntfs-3g ---> borks in 'libX11-devel' - (0099/182) Calculating build dep of unifdef (0100/182) Calculating build dep of biosdevname (0101/182) Calculating build dep of perl-Locale-gettext (0102/182) Calculating build dep of lsb-release (0103/182) Calculating build dep of mudur (0104/182) Calculating build dep of libssh2 (0105/182) Calculating build dep of zip (0106/182) Calculating build dep of pkgconfig (0107/182) Calculating build dep of perl ---> borks in 'libX11-devel' - (0108/182) Calculating build dep of m4 ---> borks in 'libX11-devel' - (0109/182) Calculating build dep of glpk (0110/182) Calculating build dep of dietlibc (0111/182) Calculating build dep of man-db (0112/182) Calculating build dep of libpcre (0113/182) Calculating build dep of groff (0114/182) Calculating build dep of xmlto ---> borks in 'libxslt' - (0115/182) Calculating build dep of libee (0116/182) Calculating build dep of cracklib (0117/182) Calculating build dep of autogen (0118/182) Calculating build dep of libmpc (0119/182) Calculating build dep of ncurses (0120/182) Calculating build dep of yasm (0121/182) Calculating build dep of libunwind (0122/182) Calculating build dep of dbus-python ---> borks in 'python3' - (0123/182) Calculating build dep of sysfsutils (0124/182) Calculating build dep of pypolkit (0125/182) Calculating build dep of grep (0126/182) Calculating build dep of attr (0127/182) Calculating build dep of plyvel ---> borks in 'libX11-devel' - (0128/182) Calculating build dep of catbox (0129/182) Calculating build dep of zlib (0130/182) Calculating build dep of libgpg-error (0131/182) Calculating build dep of autoconf (0132/182) Calculating build dep of procps (0133/182) Calculating build dep of libsigsegv (0134/182) Calculating build dep of sqlite (0135/182) Calculating build dep of chrpath (0136/182) Calculating build dep of tar (0137/182) Calculating build dep of libxml2 (0138/182) Calculating build dep of expat (0139/182) Calculating build dep of freetype (0140/182) Calculating build dep of cloog (0141/182) Calculating build dep of file (0142/182) Calculating build dep of timezone (0143/182) Calculating build dep of curl (0144/182) Calculating build dep of texinfo (0145/182) Calculating build dep of check (0146/182) Calculating build dep of dbus-glib ---> borks in 'libX11-devel' - (0147/182) Calculating build dep of bzip2 (0148/182) Calculating build dep of leveldb (0149/182) Calculating build dep of make (0150/182) Calculating build dep of gettext (0151/182) Calculating build dep of coreutils (0152/182) Calculating build dep of vixie-cron (0153/182) Calculating build dep of libcap-ng (0154/182) Calculating build dep of which (0155/182) Calculating build dep of docbook-xsl (0156/182) Calculating build dep of libcap (0157/182) Calculating build dep of pam (0158/182) Calculating build dep of wireless-tools (0159/182) Calculating build dep of xorg-util (0160/182) Calculating build dep of gperf (0161/182) Calculating build dep of time (0162/182) Calculating build dep of gcc (0163/182) Calculating build dep of polkit ---> borks in 'libX11-devel' - (0164/182) Calculating build dep of fuse ---> borks in 'libX11-devel' - (0165/182) Calculating build dep of libtool (0166/182) Calculating build dep of ncompress (0167/182) Calculating build dep of libffi (0168/182) Calculating build dep of readline (0169/182) Calculating build dep of slang (0170/182) Calculating build dep of comar (0171/182) Calculating build dep of nano ---> borks in 'libX11-devel' - (0172/182) Calculating build dep of diffutils (0173/182) Calculating build dep of urlgrabber (0174/182) Calculating build dep of usbutils (0175/182) Calculating build dep of e2fsprogs (0176/182) Calculating build dep of nettle (0177/182) Calculating build dep of libusb (0178/182) Calculating build dep of pciutils (0179/182) Calculating build dep of gzip (0180/182) Calculating build dep of nasm (0181/182) Calculating build dep of elfutils (0182/182) Calculating build dep of mpfr + (0001/181) Calculating build dep of busybox (0004/181) Calculating build dep of libpipeline (0005/181) Calculating build dep of liblogging (0006/181) Calculating build dep of alternatives (0007/181) Calculating build dep of kbd (0003/181) Calculating build dep of less (0002/181) Calculating build dep of libuser (0008/181) Calculating build dep of spidermonkey (0009/181) Calculating build dep of sysvinit (0010/181) Calculating build dep of gc (0011/181) Calculating build dep of findutils ---> borks in 'libX11-devel' + (0012/181) Calculating build dep of rsyslog (0013/181) Calculating build dep of popt (0014/181) Calculating build dep of gdbm (0015/181) Calculating build dep of python-pyliblzma (0016/181) Calculating build dep of cython (0017/181) Calculating build dep of pisilinux-python (0018/181) Calculating build dep of mingetty (0019/181) Calculating build dep of scons (0020/181) Calculating build dep of grub2 (0021/181) Calculating build dep of snappy (0022/181) Calculating build dep of gnuconfig (0023/181) Calculating build dep of os-prober (0024/181) Calculating build dep of gmp (0025/181) Calculating build dep of baselayout (0026/181) Calculating build dep of flex (0027/181) Calculating build dep of python-setuptools (0028/181) Calculating build dep of unzip (0029/181) Calculating build dep of libusb-compat (0030/181) Calculating build dep of python (0031/181) Calculating build dep of libidn (0032/181) Calculating build dep of db ---> borks in 'libX11-devel' + (0033/181) Calculating build dep of cpio (0034/181) Calculating build dep of ca-certificates (0035/181) Calculating build dep of lzo (0036/181) Calculating build dep of libseccomp (0037/181) Calculating build dep of shadow (0038/181) Calculating build dep of util-linux (0039/181) Calculating build dep of dhcpcd (0040/181) Calculating build dep of pycurl (0041/181) Calculating build dep of python-psutil (0042/181) Calculating build dep of nspr (0043/181) Calculating build dep of dbus ---> borks in 'libX11-devel' + (0044/181) Calculating build dep of numactl (0045/181) Calculating build dep of comar-api (0046/181) Calculating build dep of patch (0047/181) Calculating build dep of psmisc (0048/181) Calculating build dep of bison (0049/181) Calculating build dep of net-tools (0050/181) Calculating build dep of help2man (0051/181) Calculating build dep of man-pages ---> borks in 'libX11-devel' + (0052/181) Calculating build dep of mkinitramfs ---> borks in 'colorgcc' + (0053/181) Calculating build dep of kernel (0054/181) Calculating build dep of json-c (0055/181) Calculating build dep of yacc (0056/181) Calculating build dep of util-macros (0057/181) Calculating build dep of sed ---> borks in 'libxslt' + (0058/181) Calculating build dep of intltool (0059/181) Calculating build dep of tcp-wrappers (0060/181) Calculating build dep of gperftools (0061/181) Calculating build dep of mdadm (0062/181) Calculating build dep of klibc (0063/181) Calculating build dep of mailcap (0064/181) Calculating build dep of kmod (0065/181) Calculating build dep of nss-mdns (0066/181) Calculating build dep of pisi (0067/181) Calculating build dep of libunistring (0068/181) Calculating build dep of glibc ---> borks in 'libxslt' + (0069/181) Calculating build dep of libestr (0070/181) Calculating build dep of piksemel (0071/181) Calculating build dep of automake ---> borks in 'libxslt' + (0072/181) Calculating build dep of miscfiles (0073/181) Calculating build dep of linux-firmware (0074/181) Calculating build dep of run-parts (0075/181) Calculating build dep of libpng (0076/181) Calculating build dep of disktype ---> borks in 'colorgcc' + (0077/181) Calculating build dep of bc ---> borks in 'libX11-devel' + (0078/181) Calculating build dep of v86d (0079/181) Calculating build dep of gawk (0080/181) Calculating build dep of libgcrypt (0081/181) Calculating build dep of bash (0082/181) Calculating build dep of eudev (0083/181) Calculating build dep of docbook-xml (0084/181) Calculating build dep of pcmciautils (0085/181) Calculating build dep of openssl (0086/181) Calculating build dep of acl ---> borks in 'libX11-devel' + (0087/181) Calculating build dep of guile (0088/181) Calculating build dep of glib2 (0089/181) Calculating build dep of binutils (0090/181) Calculating build dep of ppl ---> borks in 'libX11-devel' + (0091/181) Calculating build dep of cryptsetup (0092/181) Calculating build dep of sgml-common (0093/181) Calculating build dep of lvm2 (0094/181) Calculating build dep of perl-XML-Parser (0095/181) Calculating build dep of libatomic_ops (0096/181) Calculating build dep of isl (0097/181) Calculating build dep of xz (0098/181) Calculating build dep of ntfs-3g ---> borks in 'libX11-devel' + (0099/181) Calculating build dep of unifdef (0100/181) Calculating build dep of biosdevname (0101/181) Calculating build dep of perl-Locale-gettext (0102/181) Calculating build dep of lsb-release (0103/181) Calculating build dep of mudur (0104/181) Calculating build dep of libssh2 (0105/181) Calculating build dep of zip (0106/181) Calculating build dep of pkgconfig ---> borks in 'libX11-devel' + (0107/181) Calculating build dep of perl ---> borks in 'libX11-devel' + (0108/181) Calculating build dep of m4 (0109/181) Calculating build dep of glpk (0110/181) Calculating build dep of dietlibc (0111/181) Calculating build dep of man-db (0112/181) Calculating build dep of libpcre (0113/181) Calculating build dep of groff (0114/181) Calculating build dep of xmlto ---> borks in 'libxslt' + (0115/181) Calculating build dep of libee (0116/181) Calculating build dep of cracklib (0117/181) Calculating build dep of autogen (0118/181) Calculating build dep of libmpc (0119/181) Calculating build dep of ncurses (0120/181) Calculating build dep of yasm (0121/181) Calculating build dep of libunwind (0122/181) Calculating build dep of sysfsutils (0123/181) Calculating build dep of pypolkit (0124/181) Calculating build dep of grep (0125/181) Calculating build dep of attr (0126/181) Calculating build dep of plyvel ---> borks in 'libX11-devel' + (0127/181) Calculating build dep of catbox (0128/181) Calculating build dep of zlib (0129/181) Calculating build dep of libgpg-error (0130/181) Calculating build dep of autoconf (0131/181) Calculating build dep of procps (0132/181) Calculating build dep of libsigsegv (0133/181) Calculating build dep of sqlite (0134/181) Calculating build dep of chrpath (0135/181) Calculating build dep of tar (0136/181) Calculating build dep of libxml2 (0137/181) Calculating build dep of expat (0138/181) Calculating build dep of freetype (0139/181) Calculating build dep of cloog (0140/181) Calculating build dep of file (0141/181) Calculating build dep of timezone (0142/181) Calculating build dep of curl (0143/181) Calculating build dep of texinfo (0144/181) Calculating build dep of check (0145/181) Calculating build dep of dbus-glib ---> borks in 'libX11-devel' + (0146/181) Calculating build dep of bzip2 (0147/181) Calculating build dep of leveldb (0148/181) Calculating build dep of make (0149/181) Calculating build dep of gettext (0150/181) Calculating build dep of coreutils (0151/181) Calculating build dep of vixie-cron (0152/181) Calculating build dep of libcap-ng (0153/181) Calculating build dep of which (0154/181) Calculating build dep of docbook-xsl (0155/181) Calculating build dep of libcap (0156/181) Calculating build dep of pam (0157/181) Calculating build dep of wireless-tools ---> borks in 'libX11-devel' + (0158/181) Calculating build dep of xorg-util (0159/181) Calculating build dep of gperf (0160/181) Calculating build dep of time (0161/181) Calculating build dep of gcc (0162/181) Calculating build dep of polkit (0163/181) Calculating build dep of fuse ---> borks in 'libX11-devel' + (0164/181) Calculating build dep of libtool (0165/181) Calculating build dep of ncompress (0166/181) Calculating build dep of libffi (0167/181) Calculating build dep of readline (0168/181) Calculating build dep of slang (0169/181) Calculating build dep of comar (0170/181) Calculating build dep of nano ---> borks in 'libX11-devel' + (0171/181) Calculating build dep of diffutils (0172/181) Calculating build dep of urlgrabber (0173/181) Calculating build dep of usbutils (0174/181) Calculating build dep of e2fsprogs (0175/181) Calculating build dep of nettle (0176/181) Calculating build dep of libusb (0177/181) Calculating build dep of pciutils (0178/181) Calculating build dep of gzip (0179/181) Calculating build dep of nasm (0180/181) Calculating build dep of elfutils (0181/181) Calculating build dep of mpfr Encountered cycle ['kernel', 'diffutils', 'patch', 'attr', 'glibc'] Encountered cycle ['gcc', 'isl', 'gmp'] diff --git a/system/base/dbus-python/actions.py b/system/base/dbus-python/actions.py deleted file mode 100644 index ab214707..00000000 --- a/system/base/dbus-python/actions.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import shelltools -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def setup(): - shelltools.makedirs("build-python2") - shelltools.makedirs("build-python3") - autotools.autoreconf("-fi") - - shelltools.cd("build-python3") - shelltools.system("PYTHON=python3 ../configure --prefix=/usr \ - --localstatedir=/var \ - --disable-api-docs \ - --disable-html-docs \ - --disable-static") - - shelltools.cd("../build-python2") - shelltools.system("../configure --prefix=/usr \ - --localstatedir=/var \ - --disable-api-docs \ - --disable-html-docs \ - --disable-static") - -def build(): - shelltools.cd("build-python3") - autotools.make() - - shelltools.cd("../build-python2") - autotools.make() - -def check(): - #autotools.make("check") - pass - -def install(): - pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README") - - shelltools.cd("build-python3") - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - - shelltools.cd("../build-python2") - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/system/base/dbus-python/files/suppress-warnings.patch b/system/base/dbus-python/files/suppress-warnings.patch deleted file mode 100644 index e5d7aeda..00000000 --- a/system/base/dbus-python/files/suppress-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur dbus-python-0.83.0.orig/dbus/connection.py dbus-python-0.83.0/dbus/connection.py ---- dbus-python-0.83.0.orig/dbus/connection.py 2009-04-22 13:58:33.000000000 +0300 -+++ dbus-python-0.83.0/dbus/connection.py 2009-04-22 13:58:40.000000000 +0300 -@@ -239,7 +239,7 @@ - ProxyObjectClass = ProxyObject - - def __init__(self, *args, **kwargs): -- super(Connection, self).__init__(*args, **kwargs) -+ super(Connection, self).__init__() - - # this if-block is needed because shared bus connections can be - # __init__'ed more than once diff --git a/system/base/dbus-python/pspec.xml b/system/base/dbus-python/pspec.xml deleted file mode 100644 index f6874e3e..00000000 --- a/system/base/dbus-python/pspec.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - dbus-python - http://dbus.freedesktop.org/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - AFL-2.1 - library - D-Bus Python bindings - dbus-python provides a Python module which wraps the D-Bus programming API. - http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.0.tar.gz - - python-devel - python3 - dbus-devel - dbus-glib-devel - glib2-devel - libpcre-devel - - - suppress-warnings.patch - - - - - dbus-python-common - Common dbus-python files shared between dbus-python and dbus-python3 - - dbus - - - /usr/include - /usr/lib/pkgconfig - /usr/share/doc - - - - - dbus-python - - dbus-python-common - python - dbus - glib2 - dbus-glib - - - /usr/lib/python2* - - - - - dbus-python3 - programming.language.python - D-Bus Python3 bindings - - dbus-python-common - python3 - dbus - glib2 - dbus-glib - - - /usr/lib/python3* - - - - - - 2015-04-01 - 1.2.0 - Release bump. - Kamil Atlı - suvarice@gmail.com - - - 2014-05-11 - 1.2.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 1.2.0 - rebuild. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-23 - 1.2.0 - Version bump. Remove dbus-devel from runtime dependencies. - Marcin Bojara - marcin@pisilinux.org - - - 2013-04-25 - 1.1.1 - Dep Fixed. - PisiLinux Community - admins@pisilinux.org - - - 2012-11-10 - 1.1.1 - First release - Marcin Bojara - marcin@pisilinux.org - - - diff --git a/system/base/dbus-python/translations.xml b/system/base/dbus-python/translations.xml deleted file mode 100644 index aebfdfa5..00000000 --- a/system/base/dbus-python/translations.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - dbus-python - D-Bus için Python bağlayıcıları - - From ba945b78f9a4a64eec8235896358b962b2356504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 18 May 2015 10:47:36 +0300 Subject: [PATCH 2/2] kernel verbump --- kernel/kernel/pspec.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index f9eae50d..6d1e3231 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -28,7 +28,7 @@ i - patches/linux/patch-4.0.3.gz + patches/linux/patch-4.0.4.xz @@ -111,8 +111,8 @@ i 2015-05-14 - 4.0.3 - Version bump to 4.0.3 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.3 + 4.0.4 + Version bump to 4.0.4 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.4 security Ertuğrul Erata ertugrulerata@gmail.com