* [gentoo-commits] repo/gentoo:master commit in: dev-libs/judy/files/, dev-libs/judy/
@ 2018-02-20 14:26 Brian Evans
0 siblings, 0 replies; 2+ messages in thread
From: Brian Evans @ 2018-02-20 14:26 UTC (permalink / raw
To: gentoo-commits
commit: c087e7cd49c3b754845502ac2c3b53cbc31ea272
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 14:26:41 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 14:26:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c087e7cd
dev-libs/judy: Fix QA advisory with upstream patch
See-also: https://sourceforge.net/p/judy/patches/5/
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-libs/judy/files/judy-1.0.5-gcc49.patch | 73 ++++++++++++++++++++++
.../{judy-1.0.5-r1.ebuild => judy-1.0.5-r2.ebuild} | 3 +-
2 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/dev-libs/judy/files/judy-1.0.5-gcc49.patch b/dev-libs/judy/files/judy-1.0.5-gcc49.patch
new file mode 100644
index 00000000000..c2e127626fb
--- /dev/null
+++ b/dev-libs/judy/files/judy-1.0.5-gcc49.patch
@@ -0,0 +1,73 @@
+diff -aurN a/src/JudyCommon/JudyPrivateBranch.h b/src/JudyCommon/JudyPrivateBranch.h
+--- a/src/JudyCommon/JudyPrivateBranch.h 2005-02-15 16:06:07.000000000 -0500
++++ b/src/JudyCommon/JudyPrivateBranch.h 2014-08-19 16:59:55.000000000 -0400
+@@ -19,7 +19,7 @@
+ // Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ // _________________
+
+-// @(#) $Revision: 4.57 $ $Source: /judy/src/JudyCommon/JudyPrivateBranch.h $
++// @(#) $Revision: 1.2 $ $Source: /home/doug/judy-1.0.5_min/test/../src/JudyCommon/RCS/JudyPrivateBranch.h,v $
+ //
+ // Header file for all Judy sources, for global but private (non-exported)
+ // declarations specific to branch support.
+@@ -55,7 +55,7 @@
+ {
+ Word_t j_po_Addr; // first word: Pjp_t, Word_t, etc.
+ union {
+-// Word_t j_po_DcdPop0:cJU_BITSPERWORD-cJU_BITSPERBYTE;
++ Word_t j_po_Addr1;
+ uint8_t j_po_DcdP0[sizeof(Word_t) - 1];
+ uint8_t j_po_Bytes[sizeof(Word_t)]; // last byte = jp_Type.
+ } jpo_u;
+@@ -78,13 +78,18 @@
+ // TBD: Revise this structure to not overload j_po_DcdPopO this way? The
+ // current arrangement works, its just confusing.
+
+-typedef struct _JUDY_POINTER_IMMED // JPI.
++typedef struct _JUDY_POINTER_IMMEDL
+ {
+- uint8_t j_pi_1Index[sizeof(Word_t)]; // see above.
+- uint8_t j_pi_LIndex[sizeof(Word_t) - 1]; // see above.
+- uint8_t j_pi_Type; // JP type, 1 of cJ*_JPIMMED*.
+- } jpi_t;
++ Word_t j_pL_Addr;
++ uint8_t j_pL_LIndex[sizeof(Word_t) - 1]; // see above.
++ uint8_t j_pL_Type;
++ } jpL_t;
+
++typedef struct _JUDY_POINTER_IMMED1
++ {
++ uint8_t j_p1_1Index[(2 * sizeof(Word_t)) - 1];
++ uint8_t j_p1_Type;
++ } jp1_t;
+
+ // UNION OF JP TYPES:
+ //
+@@ -96,18 +101,22 @@
+ typedef union J_UDY_POINTER // JP.
+ {
+ jpo_t j_po; // other than immediate indexes.
+- jpi_t j_pi; // immediate indexes.
++ jpL_t j_pL; // immediate indexes.
++ jp1_t j_p1; // immediate indexes.
+ } jp_t, *Pjp_t;
+
+ // For coding convenience:
+ //
+-// Note, jp_Type has the same bits in jpo_t and jpi_t.
++// Note, jp_Type has the same bits in jpo_t jpL_t and jp1_t.
+
+-#define jp_1Index j_pi.j_pi_1Index // for storing Indexes in first word.
+-#define jp_LIndex j_pi.j_pi_LIndex // for storing Indexes in second word.
++#define jp_1Index j_p1.j_p1_1Index // for storing Indexes in first word.
++#define jp_LIndex j_pL.j_pL_LIndex // for storing Indexes in second word.
+ #define jp_Addr j_po.j_po_Addr
++#define jp_Addr1 j_po.jpo_u.j_po_Addr1
+ //#define jp_DcdPop0 j_po.jpo_u.j_po_DcdPop0
+-#define jp_Type j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]
++#define jp_Addr1 j_po.jpo_u.j_po_Addr1
++//#define jp_Type j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]
++#define jp_Type j_p1.j_p1_Type
+ #define jp_DcdP0 j_po.jpo_u.j_po_DcdP0
+
+
diff --git a/dev-libs/judy/judy-1.0.5-r1.ebuild b/dev-libs/judy/judy-1.0.5-r2.ebuild
similarity index 90%
rename from dev-libs/judy/judy-1.0.5-r1.ebuild
rename to dev-libs/judy/judy-1.0.5-r2.ebuild
index cddafade8c6..e118223b34d 100644
--- a/dev-libs/judy/judy-1.0.5-r1.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,6 +17,7 @@ DOCS=( AUTHORS ChangeLog README )
src_prepare() {
eapply -p0 "${FILESDIR}/${P}-parallel-make.patch"
+ eapply "${FILESDIR}/${P}-gcc49.patch"
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
eapply_user
eautoreconf
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/judy/files/, dev-libs/judy/
@ 2018-05-27 9:47 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2018-05-27 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 0746ce682977647aa3754b1f08ab6bdf929e4b88
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 09:47:15 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May 27 09:47:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0746ce68
dev-libs/judy: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-libs/judy/Manifest | 1 -
dev-libs/judy/files/judy-1.0.4-parallel-make.patch | 184 ---------------------
dev-libs/judy/judy-1.0.4.ebuild | 32 ----
dev-libs/judy/judy-1.0.5.ebuild | 26 ---
4 files changed, 243 deletions(-)
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index 064dc2ccdad..4d9d437dedd 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,2 +1 @@
-DIST Judy-1.0.4.tar.gz 1142724 BLAKE2B 9357a6d37a9f8a15c4e06c304e5496ae271717243d79b7a1287cd6fcea5e130dcac2b1e191fff1530fb141a1d967be404a106afa3ac5005a6c71eb61491b807b SHA512 3a2fcd14a4367910ced5d1da8b46551e2847e02c1faa19c3ecd0ee542bb89c683c8998feb79abee4999a753d26ed5e7bfd9a7e2ed343a7667c7ff0d624ee384f
DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
diff --git a/dev-libs/judy/files/judy-1.0.4-parallel-make.patch b/dev-libs/judy/files/judy-1.0.4-parallel-make.patch
deleted file mode 100644
index 6e3fcbe6b67..00000000000
--- a/dev-libs/judy/files/judy-1.0.4-parallel-make.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail&aid=2219175&group_id=55753&atid=478140
-
-=== modified file 'doc/Makefile.am'
---- doc/Makefile.am 2008-11-03 15:14:54 +0000
-+++ doc/Makefile.am 2008-11-03 15:16:21 +0000
-@@ -94,114 +94,93 @@
- man/man3/JudyHSFreeArray
-
-
-+dep_on_Judy = J1T J1S J1U J1F J1N J1L J1P J1FE J1NE J1LE J1PE J1C J1BC J1FA J1MU
-+
-+$(patsubst %,man/man3/%,$(dep_on_Judy)): man/man3/Judy
-
- man/man3/Judy:
- ../tool/jhton ext/Judy_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy
-+ cd man/man3 && \
-+ for man in $(dep_on_Judy); do \
-+ ln -s Judy $$man; \
-+ done
-
- man/man3/Judy1:
- ../tool/jhton ext/Judy1_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1
-- cd man/man3; ln -s Judy J1T
-- cd man/man3; ln -s Judy J1S
-- cd man/man3; ln -s Judy J1U
-- cd man/man3; ln -s Judy J1F
-- cd man/man3; ln -s Judy J1N
-- cd man/man3; ln -s Judy J1L
-- cd man/man3; ln -s Judy J1P
-- cd man/man3; ln -s Judy J1FE
-- cd man/man3; ln -s Judy J1NE
-- cd man/man3; ln -s Judy J1LE
-- cd man/man3; ln -s Judy J1PE
-- cd man/man3; ln -s Judy J1C
-- cd man/man3; ln -s Judy J1BC
-- cd man/man3; ln -s Judy J1FA
-- cd man/man3; ln -s Judy J1MU
-+
-+dep_on_Judy1_funcs = Judy1Test Judy1Set Judy1Unset Judy1First Judy1Next Judy1Last Judy1Prev Judy1FirstEmpty Judy1NextEmpty Judy1LastEmpty Judy1PrevEmpty Judy1Count Judy1ByCount Judy1FreeArray Judy1MemUsed
-+
-+$(patsubst %,man/man3/%,$(dep_on_Judy1_funcs)): man/man3/Judy1_funcs
-
- man/man3/Judy1_funcs:
- ../tool/jhton ext/Judy1_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1_funcs
-- cd man/man3; ln -s Judy1_funcs Judy1Test
-- cd man/man3; ln -s Judy1_funcs Judy1Set
-- cd man/man3; ln -s Judy1_funcs Judy1Unset
-- cd man/man3; ln -s Judy1_funcs Judy1First
-- cd man/man3; ln -s Judy1_funcs Judy1Next
-- cd man/man3; ln -s Judy1_funcs Judy1Last
-- cd man/man3; ln -s Judy1_funcs Judy1Prev
-- cd man/man3; ln -s Judy1_funcs Judy1FirstEmpty
-- cd man/man3; ln -s Judy1_funcs Judy1NextEmpty
-- cd man/man3; ln -s Judy1_funcs Judy1LastEmpty
-- cd man/man3; ln -s Judy1_funcs Judy1PrevEmpty
-- cd man/man3; ln -s Judy1_funcs Judy1Count
-- cd man/man3; ln -s Judy1_funcs Judy1ByCount
-- cd man/man3; ln -s Judy1_funcs Judy1FreeArray
-- cd man/man3; ln -s Judy1_funcs Judy1MemUsed
-+ cd man/man3 && \
-+ for man in $(dep_on_Judy1_funcs); do \
-+ ln -s Judy1_funcs $$man; \
-+ done
-+
-+dep_on_JudyL= JLG JLI JLD JLF JLN JLL JLP JLFE JLNE JLLE JLPE JLC JLBC JLFA JLMU
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudyL)): man/man3/JudyL
-
- man/man3/JudyL:
- ../tool/jhton ext/JudyL_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudyL
-- cd man/man3; ln -s JudyL JLG
-- cd man/man3; ln -s JudyL JLI
-- cd man/man3; ln -s JudyL JLD
-- cd man/man3; ln -s JudyL JLF
-- cd man/man3; ln -s JudyL JLN
-- cd man/man3; ln -s JudyL JLL
-- cd man/man3; ln -s JudyL JLP
-- cd man/man3; ln -s JudyL JLFE
-- cd man/man3; ln -s JudyL JLNE
-- cd man/man3; ln -s JudyL JLLE
-- cd man/man3; ln -s JudyL JLPE
-- cd man/man3; ln -s JudyL JLC
-- cd man/man3; ln -s JudyL JLBC
-- cd man/man3; ln -s JudyL JLFA
-- cd man/man3; ln -s JudyL JLMU
-+ cd man/man3 && \
-+ for man in $(dep_on_JudyL); do \
-+ ln -s JudyL $$man; \
-+ done
-+
-+dep_on_JudyL_funcs = JudyLGet JudyLIns JudyLDel JudyLFirst JudyLNext JudyLLast JudyLPrev JudyLFirstEmpty JudyLNextEmpty JudyLLastEmpty JudyLPrevEmpty JudyLCount JudyLByCount JudyLFreeArray JudyLMemUsed
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudyL_funcs)): man/man3/JudyL_funcs
-
- man/man3/JudyL_funcs:
- ../tool/jhton ext/JudyL_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudyL_funcs
-- cd man/man3; ln -s JudyL_funcs JudyLGet
-- cd man/man3; ln -s JudyL_funcs JudyLIns
-- cd man/man3; ln -s JudyL_funcs JudyLDel
-- cd man/man3; ln -s JudyL_funcs JudyLFirst
-- cd man/man3; ln -s JudyL_funcs JudyLNext
-- cd man/man3; ln -s JudyL_funcs JudyLLast
-- cd man/man3; ln -s JudyL_funcs JudyLPrev
-- cd man/man3; ln -s JudyL_funcs JudyLFirstEmpty
-- cd man/man3; ln -s JudyL_funcs JudyLNextEmpty
-- cd man/man3; ln -s JudyL_funcs JudyLLastEmpty
-- cd man/man3; ln -s JudyL_funcs JudyLPrevEmpty
-- cd man/man3; ln -s JudyL_funcs JudyLCount
-- cd man/man3; ln -s JudyL_funcs JudyLByCount
-- cd man/man3; ln -s JudyL_funcs JudyLFreeArray
-- cd man/man3; ln -s JudyL_funcs JudyLMemUsed
-+ cd man/man3 && \
-+ for man in $(dep_on_JudyL_funcs); do \
-+ ln -s JudyL_funcs $$man; \
-+ done
-+
-+dep_on_JudySL = JSLG JSLI JSLD JSLF JSLN JSLL JSLP JSLFA
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudySL)): man/man3/JudySL
-
- man/man3/JudySL:
- ../tool/jhton ext/JudySL_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudySL
-- cd man/man3; ln -s JudySL JSLG
-- cd man/man3; ln -s JudySL JSLI
-- cd man/man3; ln -s JudySL JSLD
-- cd man/man3; ln -s JudySL JSLF
-- cd man/man3; ln -s JudySL JSLN
-- cd man/man3; ln -s JudySL JSLL
-- cd man/man3; ln -s JudySL JSLP
-- cd man/man3; ln -s JudySL JSLFA
-+ cd man/man3 && \
-+ for man in $(dep_on_JudySL); do \
-+ ln -s JudySL $$man; \
-+ done
-+
-+dep_on_JudySL_funcs = JudySLGet JudySLIns JudySLDel JudySLFirst JudySLNext JudySLLast JudySLPrev JudySLFreeArray
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudySL_funcs)): man/man3/JudySL_funcs
-
- man/man3/JudySL_funcs:
- ../tool/jhton ext/JudySL_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudySL_funcs
-- cd man/man3; ln -s JudySL_funcs JudySLGet
-- cd man/man3; ln -s JudySL_funcs JudySLIns
-- cd man/man3; ln -s JudySL_funcs JudySLDel
-- cd man/man3; ln -s JudySL_funcs JudySLFirst
-- cd man/man3; ln -s JudySL_funcs JudySLNext
-- cd man/man3; ln -s JudySL_funcs JudySLLast
-- cd man/man3; ln -s JudySL_funcs JudySLPrev
-- cd man/man3; ln -s JudySL_funcs JudySLFreeArray
-+ cd man/man3 && \
-+ for man in $(dep_on_JudySL_funcs); do \
-+ ln -s JudySL_funcs $$man; \
-+ done
-+
-+dep_on_JudyHS = JHSG JHSI JHSD JHSFA
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudyHS)): man/man3/JudyHS
-
- man/man3/JudyHS:
- ../tool/jhton ext/JudyHS_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudyHS
-- cd man/man3; ln -s JudyHS JHSG
-- cd man/man3; ln -s JudyHS JHSI
-- cd man/man3; ln -s JudyHS JHSD
-- cd man/man3; ln -s JudyHS JHSFA
-+ cd man/man3 && \
-+ for man in $(dep_on_JudyHS); do \
-+ ln -s JudyHS $$man; \
-+ done
-+
-+dep_on_JudyHS_funcs = JudyHSGet JudyHSIns JudyHSDel JudyHSFreeArray
-+
-+$(patsubst %,man/man3/%,$(dep_on_JudyHS_funcs)): man/man3/JudyHS_funcs
-
- man/man3/JudyHS_funcs:
- ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs
-- cd man/man3; ln -s JudyHS_funcs JudyHSGet
-- cd man/man3; ln -s JudyHS_funcs JudyHSIns
-- cd man/man3; ln -s JudyHS_funcs JudyHSDel
-- cd man/man3; ln -s JudyHS_funcs JudyHSFreeArray
-+ cd man/man3 && \
-+ for man in $(dep_on_JudyHS_funcs); do \
-+ ln -s JudyHS_funcs $$man; \
-+ done
-
diff --git a/dev-libs/judy/judy-1.0.4.ebuild b/dev-libs/judy/judy-1.0.4.ebuild
deleted file mode 100644
index e6ba1447753..00000000000
--- a/dev-libs/judy/judy-1.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-MY_P=Judy-${PV}
-
-DESCRIPTION="A C library that implements a dynamic array"
-HOMEPAGE="http://judy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/judy/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-parallel-make.patch"
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog README
-}
diff --git a/dev-libs/judy/judy-1.0.5.ebuild b/dev-libs/judy/judy-1.0.5.ebuild
deleted file mode 100644
index ed9582a2a89..00000000000
--- a/dev-libs/judy/judy-1.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A C library that implements a dynamic array"
-HOMEPAGE="http://judy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-parallel-make.patch"
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog README
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-27 9:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-27 9:47 [gentoo-commits] repo/gentoo:master commit in: dev-libs/judy/files/, dev-libs/judy/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2018-02-20 14:26 Brian Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox