Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Nathan Phillip Brink (binki)" <binki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-irc/atheme-services/files: atheme-services-7.0.0_alpha11-cracklib-automagic.patch atheme-services-6.0.9-cracklib-automagic.patch
Date: Tue, 03 Jan 2012 05:43:18
Message-Id: 20120103054307.A37592001D@flycatcher.gentoo.org
1 binki 12/01/03 05:43:07
2
3 Added:
4 atheme-services-7.0.0_alpha11-cracklib-automagic.patch
5 atheme-services-6.0.9-cracklib-automagic.patch
6 Log:
7 Add patch removing automagic dependence on sys-libs/cracklib, fixes bug #397401 reported by kensington.
8
9 (Portage version: 2.2.0_alpha82-r1/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-cracklib-automagic.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-cracklib-automagic.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-cracklib-automagic.patch?rev=1.1&content-type=text/plain
16
17 Index: atheme-services-7.0.0_alpha11-cracklib-automagic.patch
18 ===================================================================
19 From ca15c587e5c102abe0bc72a3112f7c5c6c879483 Mon Sep 17 00:00:00 2001
20 From: Nathan Phillip Brink <binki@g.o>
21 Date: Tue, 3 Jan 2012 01:47:31 +0000
22 Subject: [PATCH] Add --with-cracklib/--without-cracklib ./configure options and only pass -lcrack when compiling nickserv/cracklib module.
23
24 Being able to disable cracklib at ./configure time fixes an automagic
25 dependency (https://bugs.gentoo.org/397401 with original patch from
26 kensington). Only linking against cracklib when necessary hopefully
27 makes compilation and loading of modules slightly more efficient.
28 ---
29 configure | 27 ++++++++++++++++++++++++++-
30 configure.ac | 16 +++++++++++++++-
31 extra.mk.in | 1 +
32 modules/nickserv/Makefile | 9 +++++++++
33 4 files changed, 51 insertions(+), 2 deletions(-)
34
35 diff --git a/configure b/configure
36 index 14a14da..fe8024f 100755
37 diff --git a/configure.ac b/configure.ac
38 index ed7d105..ab0adb5 100644
39 --- a/configure.ac
40 +++ b/configure.ac
41 @@ -97,8 +97,22 @@ AC_SEARCH_LIBS(crypt, crypt, [POSIX_CRYPTC="posix.c"])
42 AC_SUBST(POSIX_CRYPTC)
43
44 CRACKLIB_C=""
45 -AC_SEARCH_LIBS(FascistCheck, crack, [CRACKLIB_C="cracklib.c"])
46 +CRACKLIB_LIBS=""
47 +AC_ARG_WITH([cracklib],
48 + [AS_HELP_STRING([--with-cracklib], [Compile cracklib nickserv submodule for checking password strength.])],
49 + [],
50 + [with_cracklib="auto"])
51 +AS_IF([test "x$with_cracklib" != "xno"],
52 + [LIBS_save="$LIBS"
53 + AC_SEARCH_LIBS([FascistCheck], [crack],
54 + [CRACKLIB_C="cracklib.c"
55 + AS_IF([test "x$ac_cv_search_FascistCheck" != "xnone required"],
56 + [CRACKLIB_LIBS="$ac_cv_search_FascistCheck"])],
57 + [AS_IF([test "x$with_cracklib" != "xauto"],
58 + [AC_MSG_ERROR([--with-cracklib was specified but cracklib could not be found.])])])
59 + LIBS="$LIBS_save"])
60 AC_SUBST(CRACKLIB_C)
61 +AC_SUBST([CRACKLIB_LIBS])
62
63 AC_ARG_WITH([ldap],
64 [AS_HELP_STRING([--without-ldap],[Disable building ldap auth module.])],
65 diff --git a/extra.mk.in b/extra.mk.in
66 index a59418c..bdce891 100644
67 --- a/extra.mk.in
68 +++ b/extra.mk.in
69 @@ -123,6 +123,7 @@ EGREP ?= @EGREP@
70 VERSION ?= @VERSION@
71 prefix ?= @prefix@
72 CRACKLIB_C ?= @CRACKLIB_C@
73 +CRACKLIB_LIBS ?= @CRACKLIB_LIBS@
74 CONTRIB_ENABLE ?= @CONTRIB_ENABLE@
75 PERL_ENABLE ?= @PERL_ENABLE@
76 PERL_CFLAGS ?= @PERL_CFLAGS@
77 diff --git a/modules/nickserv/Makefile b/modules/nickserv/Makefile
78 index 3014bbb..2506be4 100644
79 --- a/modules/nickserv/Makefile
80 +++ b/modules/nickserv/Makefile
81 @@ -72,3 +72,12 @@ include ../../buildsys.module.mk
82 CPPFLAGS += -I../../include
83 LIBS += -L../../libathemecore -lathemecore ${LDFLAGS_RPATH}
84
85 +# Custom rule for cracklib.c which is the only module to ever need
86 +# -lcrack.
87 +cracklib$(PLUGIN_SUFFIX): cracklib.c
88 + ${COMPILE_STATUS}
89 + if ${CC} -MMD -MP ${CFLAGS} ${PLUGIN_CFLAGS} ${CPPFLAGS} ${PLUGIN_LDFLAGS} ${LDFLAGS} -o $@ ${CRACKLIB_C} ${LIBS} ${CRACKLIB_LIBS}; then \
90 + ${COMPILE_OK}; \
91 + else \
92 + ${COMPILE_FAILED}; \
93 + fi
94 --
95 1.7.3.4
96
97
98
99
100 1.1 net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch
101
102 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch?rev=1.1&view=markup
103 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch?rev=1.1&content-type=text/plain
104
105 Index: atheme-services-6.0.9-cracklib-automagic.patch
106 ===================================================================
107 From 79f41f4e7647335beca977d852c6c83abebcc2bd Mon Sep 17 00:00:00 2001
108 From: Nathan Phillip Brink <binki@g.o>
109 Date: Tue, 3 Jan 2012 01:47:31 +0000
110 Subject: [PATCH] Add --with-cracklib/--without-cracklib ./configure options and only pass -lcrack when compiling nickserv/cracklib module.
111
112 Being able to disable cracklib at ./configure time fixes an automagic
113 dependency (https://bugs.gentoo.org/397401 with original patch from
114 kensington). Only linking against cracklib when necessary hopefully
115 makes compilation and loading of modules slightly more efficient.
116 ---
117 configure | 27 ++++++++++++++++++++++++++-
118 configure.ac | 16 +++++++++++++++-
119 extra.mk.in | 1 +
120 modules/nickserv/Makefile | 10 ++++++++++
121 4 files changed, 52 insertions(+), 2 deletions(-)
122
123 diff --git a/configure b/configure
124 index 63540aa..ee8d554 100755
125 diff --git a/configure.ac b/configure.ac
126 index 83c4aeb..a6d8b6e 100644
127 --- a/configure.ac
128 +++ b/configure.ac
129 @@ -95,8 +95,22 @@ AC_SEARCH_LIBS(crypt, crypt, [POSIX_CRYPTC="posix.c"])
130 AC_SUBST(POSIX_CRYPTC)
131
132 CRACKLIB_C=""
133 -AC_SEARCH_LIBS(FascistCheck, crack, [CRACKLIB_C="cracklib.c"])
134 +CRACKLIB_LIBS=""
135 +AC_ARG_WITH([cracklib],
136 + [AS_HELP_STRING([--with-cracklib], [Compile cracklib nickserv submodule for checking password strength.])],
137 + [],
138 + [with_cracklib="auto"])
139 +AS_IF([test "x$with_cracklib" != "xno"],
140 + [LIBS_save="$LIBS"
141 + AC_SEARCH_LIBS([FascistCheck], [crack],
142 + [CRACKLIB_C="cracklib.c"
143 + AS_IF([test "x$ac_cv_search_FascistCheck" != "xnone required"],
144 + [CRACKLIB_LIBS="$ac_cv_search_FascistCheck"])],
145 + [AS_IF([test "x$with_cracklib" != "xauto"],
146 + [AC_MSG_ERROR([--with-cracklib was specified but cracklib could not be found.])])])
147 + LIBS="$LIBS_save"])
148 AC_SUBST(CRACKLIB_C)
149 +AC_SUBST([CRACKLIB_LIBS])
150
151 AC_ARG_WITH([ldap],
152 [AS_HELP_STRING([--without-ldap],[Disable building ldap auth module.])],
153 diff --git a/extra.mk.in b/extra.mk.in
154 index cc6af70..2d01345 100644
155 --- a/extra.mk.in
156 +++ b/extra.mk.in
157 @@ -123,4 +123,5 @@ EGREP ?= @EGREP@
158 VERSION ?= @VERSION@
159 prefix ?= @prefix@
160 CRACKLIB_C ?= @CRACKLIB_C@
161 +CRACKLIB_LIBS ?= @CRACKLIB_LIBS@
162 CONTRIB_ENABLE ?= @CONTRIB_ENABLE@
163 diff --git a/modules/nickserv/Makefile b/modules/nickserv/Makefile
164 index 060f708..d2f7c4e 100644
165 --- a/modules/nickserv/Makefile
166 +++ b/modules/nickserv/Makefile
167 @@ -68,3 +68,13 @@ BASE_SRCS = \
168 SRCS = ${BASE_SRCS} ${EXTRA_SRCS}
169
170 CPPFLAGS += -I../../include
171 +
172 +# Custom rule for cracklib.c which is the only module to ever need
173 +# -lcrack.
174 +cracklib$(PLUGIN_SUFFIX): cracklib.c
175 + ${COMPILE_STATUS}
176 + if ${CC} -MMD -MP ${CFLAGS} ${PLUGIN_CFLAGS} ${CPPFLAGS} ${PLUGIN_LDFLAGS} ${LDFLAGS} -o $@ ${CRACKLIB_C} ${LIBS} ${CRACKLIB_LIBS}; then \
177 + ${COMPILE_OK}; \
178 + else \
179 + ${COMPILE_FAILED}; \
180 + fi
181 --
182 1.7.3.4
Report Message
Find on MARC Find on Google Groups