Accepting request 62762 from Base:System
Accepted submit request 62762 from user elvigia OBS-URL: https://build.opensuse.org/request/show/62762 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cracklib?expand=0&rev=36
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
48c7a1ae61
108
cracklib-visibility.patch
Normal file
108
cracklib-visibility.patch
Normal file
@ -0,0 +1,108 @@
|
||||
--- lib/crack.h.orig
|
||||
+++ lib/crack.h
|
||||
@@ -5,6 +5,10 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
+#ifndef CRACKLIB_API
|
||||
+#define CRACKLIB_API extern
|
||||
+#endif
|
||||
+
|
||||
/* Pass this function a password (pw) and a path to the
|
||||
* dictionaries (/usr/lib/cracklib_dict should be specified)
|
||||
* and it will either return a NULL string, meaning that the
|
||||
@@ -13,11 +17,11 @@ extern "C" {
|
||||
* You must link with -lcrack
|
||||
*/
|
||||
|
||||
-extern const char *FascistCheck(const char *pw, const char *dictpath);
|
||||
+CRACKLIB_API const char *FascistCheck(const char *pw, const char *dictpath);
|
||||
|
||||
/* This function returns the compiled in value for DEFAULT_CRACKLIB_DICT.
|
||||
*/
|
||||
-extern const char *GetDefaultCracklibDict(void);
|
||||
+CRACKLIB_API const char *GetDefaultCracklibDict(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
};
|
||||
--- configure.in.orig
|
||||
+++ configure.in
|
||||
@@ -90,6 +90,45 @@ AM_CONDITIONAL(BUILD_PYTHON,[test "$buil
|
||||
dnl Handle local dict compiling properly
|
||||
AC_SUBST(CROSS_COMPILING, $cross_compiling)
|
||||
|
||||
+ dnl ************************************************************
|
||||
+ dnl Enable hiding of internal symbols in library to reduce its size and
|
||||
+ dnl speed dynamic linking of applications. This currently is only supported
|
||||
+ dnl on gcc >= 4.0 and SunPro C.
|
||||
+ dnl
|
||||
+ AC_MSG_CHECKING([whether to enable hidden symbols in the library])
|
||||
+ AC_ARG_ENABLE(hidden-symbols,
|
||||
+ AC_HELP_STRING([--enable-hidden-symbols],[Hide internal symbols in library])
|
||||
+ AC_HELP_STRING([--disable-hidden-symbols],[Leave all symbols with default visibility in library]),
|
||||
+ [ case "$enableval" in
|
||||
+ no)
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ ;;
|
||||
+ *)
|
||||
+ AC_MSG_CHECKING([whether $CC supports it])
|
||||
+ if test "$GCC" = yes ; then
|
||||
+ if $CC --help --verbose 2>&1 | grep fvisibility= > /dev/null ; then
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ AC_DEFINE(CRACKLIB_API, [extern __attribute__ ((visibility ("default")))], [to make a symbol visible])
|
||||
+ CFLAGS="$CFLAGS -fvisibility=hidden"
|
||||
+ else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ fi
|
||||
+
|
||||
+ else
|
||||
+ dnl Test for SunPro cc
|
||||
+ if $CC 2>&1 | grep flags >/dev/null && $CC -flags | grep xldscope= >/dev/null ; then
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ AC_DEFINE(CRACKLIB_API, [__global], [to make a symbol visible])
|
||||
+ CFLAGS="$CFLAGS -xldscope=hidden"
|
||||
+ else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ fi
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac ],
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ )
|
||||
+
|
||||
AC_OUTPUT(util/Makefile lib/Makefile doc/Makefile python/Makefile Makefile \
|
||||
python/setup.py \
|
||||
po/Makefile.in m4/Makefile dicts/Makefile cracklib.spec)
|
||||
--- lib/packer.h.orig
|
||||
+++ lib/packer.h
|
||||
@@ -74,7 +74,7 @@ typedef struct
|
||||
#define PIH_MAGIC 0x70775631
|
||||
|
||||
/* Internal routines */
|
||||
-extern char *GetPW(PWDICT *pwp, uint32_t number);
|
||||
+CRACKLIB_API char *GetPW(PWDICT *pwp, uint32_t number);
|
||||
|
||||
#else
|
||||
|
||||
@@ -85,13 +85,13 @@ typedef struct {
|
||||
|
||||
#endif
|
||||
|
||||
-extern PWDICT *PWOpen(const char *prefix, char *mode);
|
||||
-extern int PWClose(PWDICT *pwp);
|
||||
-extern unsigned int FindPW(PWDICT *pwp, char *string);
|
||||
-extern int PutPW(PWDICT *pwp, char *string);
|
||||
-extern int PMatch(char *control, char *string);
|
||||
-extern char *Mangle(char *input, char *control);
|
||||
-extern char Chop(char *string);
|
||||
-extern char *Trim(char *string);
|
||||
+CRACKLIB_API PWDICT *PWOpen(const char *prefix, char *mode);
|
||||
+CRACKLIB_API int PWClose(PWDICT *pwp);
|
||||
+CRACKLIB_API unsigned int FindPW(PWDICT *pwp, char *string);
|
||||
+CRACKLIB_API int PutPW(PWDICT *pwp, char *string);
|
||||
+CRACKLIB_API int PMatch(char *control, char *string);
|
||||
+CRACKLIB_API char *Mangle(char *input, char *control);
|
||||
+CRACKLIB_API char Chop(char *string);
|
||||
+CRACKLIB_API char *Trim(char *string);
|
||||
|
||||
#endif
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 14 17:35:37 CET 2011 - sbrabec@suse.cz
|
||||
|
||||
- Added support for translation-update-upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 30 22:56:15 UTC 2010 - cristian.rodriguez@opensuse.org
|
||||
|
||||
- Support GCC visibility
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 21 18:49:22 CEST 2010 - ro@suse.de
|
||||
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
|
||||
Name: cracklib
|
||||
BuildRequires: gzip zlib-devel
|
||||
BuildRequires: translation-update-upstream
|
||||
Url: http://sourceforge.net/projects/cracklib
|
||||
License: Artistic
|
||||
Group: System/Libraries
|
||||
@ -38,6 +39,8 @@ Source2: baselibs.conf
|
||||
# PATCH-FIX-OPENSUSE (should be upstreamed)
|
||||
# Remove support for broken 64bit indexes from magic entry [bnc#106007]
|
||||
Patch: cracklib-magic.diff
|
||||
# PATCH-FIX-OPENSUSE Hide non-public functions
|
||||
Patch1: cracklib-visibility.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -93,11 +96,12 @@ This package contains a small dictionay file used by cracklib.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
%patch
|
||||
|
||||
%patch1
|
||||
%build
|
||||
AUTOPOINT=true autoreconf -fi
|
||||
%configure --disable-static --with-pic
|
||||
%configure --enable-hidden-symbols --disable-static --with-pic
|
||||
%{__make} %{?_smp_mflags}
|
||||
make -C po update-po
|
||||
|
||||
@ -128,6 +132,9 @@ ln -sf %{_datadir}/cracklib/pw_dict.pwi $RPM_BUILD_ROOT/usr/lib/cracklib_dict.pw
|
||||
#gzip $RPM_BUILD_ROOT/%{_datadir}/cracklib/pw_dict.pwd
|
||||
#ln -sf %{_datadir}/cracklib/pw_dict.pwd.gz $RPM_BUILD_ROOT/usr/lib/cracklib_dict.pwd.gz
|
||||
%{find_lang} %{name}
|
||||
nm -C -D %{buildroot}%{_libdir}/libcrack.so.2 | grep ' T '
|
||||
%check
|
||||
make check
|
||||
|
||||
%post -n libcrack2 -p /sbin/ldconfig
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user