From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 47934bca9f4d7d1b3c2b8a19f68a1abbe1a46a7b
Date: Tue, 09 Oct 2012 22:20:18 +0200 [thread overview]
Message-ID: <20121009202018.B54B1200C5@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 7884 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 47934bca9f4d7d1b3c2b8a19f68a1abbe1a46a7b (commit)
via 3b6f5fb7105a1548f5f6755c5d7e22390745c72a (commit)
via 6453a48a8b0cdf2702e2abf799c9fbbe28de52a0 (commit)
via fe1d17eed486f22d0275b2d2fb9c1348317d5309 (commit)
via e529cfa5f1040dcbeb445a6efbea2119f520439f (commit)
from 225140ae8fc9f3cedfb32729169f6d98875820ce (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 47934bca9f4d7d1b3c2b8a19f68a1abbe1a46a7b
Merge: 3b6f5fb 225140a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 22:20:12 2012 +0200
Merge remote-tracking branch 'origin/thirteen' into thirteen
commit 3b6f5fb7105a1548f5f6755c5d7e22390745c72a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 22:18:13 2012 +0200
python-pycurl: Add missing patches.
commit 6453a48a8b0cdf2702e2abf799c9fbbe28de52a0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 19:05:28 2012 +0200
pciutils: Update rootfile.
commit fe1d17eed486f22d0275b2d2fb9c1348317d5309
Merge: 1913c6a e529cfa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 12:24:09 2012 +0200
Merge remote-tracking branch 'ms/pciutils' into thirteen
commit e529cfa5f1040dcbeb445a6efbea2119f520439f
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Mon Oct 8 20:44:52 2012 +0200
pciutils: Update to 3.1.10.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/pciutils | 23 +++-------
lfs/pciutils | 42 +++++++++----------
.../python-pycurl-fix-do_curl_reset-refcount.patch | 24 +++++++++++
src/patches/python-pycurl-no-static-libs.patch | 12 ++++++
4 files changed, 63 insertions(+), 38 deletions(-)
create mode 100644 src/patches/python-pycurl-fix-do_curl_reset-refcount.patch
create mode 100644 src/patches/python-pycurl-no-static-libs.patch
Difference in files:
diff --git a/config/rootfiles/common/pciutils b/config/rootfiles/common/pciutils
index 260f271..43c31a1 100644
--- a/config/rootfiles/common/pciutils
+++ b/config/rootfiles/common/pciutils
@@ -1,21 +1,12 @@
+bin/lspci
+bin/setpci
+lib/libpci.so.3
+lib/libpci.so.3.1.10
+sbin/update-pciids
#usr/include/pci
#usr/include/pci/config.h
#usr/include/pci/header.h
-#usr/include/pci/i386-io-hurd.h
-#usr/include/pci/i386-io-linux.h
-#usr/include/pci/i386-io-sunos.h
-#usr/include/pci/i386-io-windows.h
-#usr/include/pci/internal.h
#usr/include/pci/pci.h
-#usr/include/pci/pread.h
-#usr/include/pci/sysdep.h
#usr/include/pci/types.h
-#usr/lib/libpci.a
-usr/sbin/lspci
-usr/sbin/setpci
-usr/sbin/update-pciids
-#usr/share/hwdata
-#usr/share/hwdata/pci.ids
-#usr/share/man/man8/lspci.8
-#usr/share/man/man8/setpci.8
-#usr/share/man/man8/update-pciids.8
+#usr/lib/libpci.so
+#usr/lib/pkgconfig/libpci.pc
diff --git a/lfs/pciutils b/lfs/pciutils
index 164a027..fc4a962 100644
--- a/lfs/pciutils
+++ b/lfs/pciutils
@@ -24,10 +24,10 @@
include Config
-VER = 2.2.3
+VER = 3.1.10
THISAPP = pciutils-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 86cc20eaa0360587497a8105d33e57fc
+$(DL_FILE)_MD5 = cdb1e5a95ab7ac67349f10c8f77a6d3c
install : $(TARGET)
@@ -69,24 +69,22 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && sed -i 's/null ;/null 2>\&1 ;/' update-pciids.sh
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-strip.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.1.10-scan.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-havepread.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-devicetype.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.2.1-idpath.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.1.99-gcc4.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.2.3-multilib.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pciutils-2.2.3-sata.patch
-ifeq "$(MACHINE_TYPE)" "arm"
- cd $(DIR_APP)/lib && ./configure /usr/share/hwdata $(VER)
- cd $(DIR_APP)/lib && sed -e "s/^#error.*$$/#define CPU_ARCH_ARM/" -i config.h
-endif
- cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING)
- cd $(DIR_APP) && make PREFIX=/usr install
- cd $(DIR_APP) && install -v -m 755 -d /usr/include/pci
- cd $(DIR_APP) && install -v -m 644 lib/libpci.a /usr/lib
- cd $(DIR_APP) && install -v -m 644 lib/*.h /usr/include/pci
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make SHARED=yes OPT="$(CFLAGS)" PREFIX=/usr STRIP="" \
+ IDSDIR=/usr/share/hwdata ZLIB=no $(MAKETUNING)
+
+ cd $(DIR_APP) && install -p lspci setpci /bin
+ cd $(DIR_APP) && install -p update-pciids /sbin
+ cd $(DIR_APP) && install -p lib/libpci.so.* /lib/
+ ln -svf ../../lib/libpci.so.$(VER) /usr/lib/libpci.so
+
+ # Install headers.
+ mkdir -pv /usr/include/pci
+ cd $(DIR_APP) && install -p lib/pci.h /usr/include/pci
+ cd $(DIR_APP) && install -p lib/header.h /usr/include/pci
+ cd $(DIR_APP) && install -p lib/config.h /usr/include/pci
+ cd $(DIR_APP) && install -p lib/types.h /usr/include/pci
+ cd $(DIR_APP) && install -p lib/libpci.pc /usr/lib/pkgconfig
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch b/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch
new file mode 100644
index 0000000..7e20b15
--- /dev/null
+++ b/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch
@@ -0,0 +1,24 @@
+--- a/src/pycurl.c
++++ a/src/pycurl.c
+@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self)
+ }
+ }
+
++ Py_INCREF(Py_None);
+ return Py_None;
+ }
+
+--- a/tests/test_internals.py
++++ a/tests/test_internals.py
+@@ -245,6 +245,11 @@ if 1 and gc:
+ if opts.verbose >= 1:
+ print "Tracked objects:", len(gc.get_objects())
+
++if 1:
++ # Ensure that the refcounting error in "reset" is fixed:
++ for i in xrange(100000):
++ c = Curl()
++ c.reset()
+
+ # /***********************************************************************
+ # // done
diff --git a/src/patches/python-pycurl-no-static-libs.patch b/src/patches/python-pycurl-no-static-libs.patch
new file mode 100644
index 0000000..c1410dc
--- /dev/null
+++ b/src/patches/python-pycurl-no-static-libs.patch
@@ -0,0 +1,12 @@
+--- setup.py~ 2008-04-22 17:00:45.000000000 +0300
++++ setup.py 2008-07-03 21:53:36.000000000 +0300
+@@ -97,8 +97,7 @@
+ else:
+ extra_compile_args.append(e)
+ libs = split_quoted(
+- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
++ os.popen("'%s' --libs" % CURL_CONFIG).read())
+ for e in libs:
+ if e[:2] == "-l":
+ libraries.append(e[2:])
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-10-09 20:20 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=20121009202018.B54B1200C5@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