forked from pool/cyrus-sasl
Accepting request 120534 from home:elvigia:branches:network
- Ensure libraries and tools are built with LFS and include config.h in all C files. - remove rpath - Move some doc files to devel package and to cyrus-sasl-saslauthd. - Ensure libraries and tools are built with LFS and include config.h in all C files. OBS-URL: https://build.opensuse.org/request/show/120534 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=30
This commit is contained in:
Git OBS Bridge
parent
80bac909af
commit
5e1a38d881
83
cyrus-sasl-lfs.patch
Normal file
83
cyrus-sasl-lfs.patch
Normal file
@ -0,0 +1,83 @@
|
||||
--- configure.in.orig
|
||||
+++ configure.in
|
||||
@@ -84,7 +84,9 @@ AC_ARG_ENABLE(obsolete_cram_attr,
|
||||
enable_obsolete_cram_attr=$enableval,
|
||||
enable_obsolete_cram_attr=yes)
|
||||
|
||||
-AC_PROG_CC
|
||||
+AC_PROG_CC_STDC
|
||||
+AC_USE_SYSTEM_EXTENSIONS
|
||||
+AC_SYS_LARGEFILE
|
||||
AC_PROG_CPP
|
||||
AC_PROG_AWK
|
||||
AC_PROG_LN_S
|
||||
--- saslauthd/configure.in.orig
|
||||
+++ saslauthd/configure.in
|
||||
@@ -19,7 +19,9 @@ AM_INIT_AUTOMAKE(saslauthd,2.1.25)
|
||||
CMU_INIT_AUTOMAKE
|
||||
|
||||
dnl Checks for programs.
|
||||
-AC_PROG_CC
|
||||
+AC_PROG_CC_STDC
|
||||
+AC_USE_SYSTEM_EXTENSIONS
|
||||
+AC_SYS_LARGEFILE
|
||||
AC_PROG_CPP
|
||||
AC_PROG_AWK
|
||||
AC_PROG_MAKE_SET
|
||||
--- plugins/Makefile.am.orig
|
||||
+++ plugins/Makefile.am
|
||||
@@ -49,7 +49,8 @@
|
||||
plugin_version = 2:25:0
|
||||
|
||||
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
|
||||
-AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
|
||||
+AM_CPPFLAGS = -include $(top_builddir)/config.h
|
||||
+AM_LDFLAGS = -module -shared -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
|
||||
|
||||
COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
|
||||
|
||||
--- lib/Makefile.am.orig
|
||||
+++ lib/Makefile.am
|
||||
@@ -43,7 +43,8 @@
|
||||
# Library version info - here at the top, for sanity
|
||||
sasl_version = 2:25:0
|
||||
|
||||
-INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
|
||||
+
|
||||
+AM_CPPFLAGS= -include $(top_builddir)/config.h -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
|
||||
|
||||
EXTRA_DIST = windlopen.c staticopen.h NTMakefile
|
||||
EXTRA_LIBRARIES = libsasl2.a
|
||||
--- saslauthd/Makefile.am.orig
|
||||
+++ saslauthd/Makefile.am
|
||||
@@ -26,7 +26,7 @@ saslcache_SOURCES = saslcache.c
|
||||
|
||||
EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include \
|
||||
getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
|
||||
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include
|
||||
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include
|
||||
DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
|
||||
|
||||
|
||||
--- utils/Makefile.am.orig
|
||||
+++ utils/Makefile.am
|
||||
@@ -89,7 +89,7 @@ libsfsasl2_la_SOURCES =
|
||||
libsfsasl2_la_LIBADD = sfsasl.lo
|
||||
libsfsasl2_la_LDFLAGS = -version-info 1:0:0 -export-dynamic -rpath $(libdir)
|
||||
|
||||
-INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
|
||||
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
|
||||
EXTRA_DIST = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8 sfsasl.h sfsasl.c smtptest.c testsuite.c pluginviewer.c NTMakefile
|
||||
|
||||
sfsasl.lo: sfsasl.c
|
||||
--- sasldb/Makefile.am.orig
|
||||
+++ sasldb/Makefile.am
|
||||
@@ -44,7 +44,7 @@
|
||||
# Note that this doesn't necessaraly follow the libsasl2 verison info
|
||||
sasl_version = 1:25:0
|
||||
|
||||
-INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
|
||||
+AM_CPPFLAGS= -include $(top_builddir)/config.h -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
|
||||
|
||||
extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
|
||||
|
||||
@ -1,12 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 4 14:13:51 UTC 2012 - dvaleev@suse.com
|
||||
Wed May 9 21:47:48 UTC 2012 - crrodriguez@opensuse.org
|
||||
|
||||
- remove rpath
|
||||
- Ensure libraries and tools are built with LFS and include
|
||||
config.h in all C files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 18 13:06:35 UTC 2012 - aj@suse.de
|
||||
Wed Apr 4 14:13:36 UTC 2012 - dvaleev@suse.com
|
||||
|
||||
- Move some doc files from cyrus-sasl to here.
|
||||
- remove rpath
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 18 13:06:00 UTC 2012 - aj@suse.de
|
||||
|
||||
- Move some doc files to devel package and to cyrus-sasl-saslauthd.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 25 10:05:58 UTC 2011 - rhafer@suse.de
|
||||
|
||||
@ -16,16 +16,21 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: cyrus-sasl-saslauthd
|
||||
BuildRequires: db-devel krb5-devel mysql-devel openldap2-devel opie pam-devel postgresql-devel
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libtool
|
||||
License: BSD-4-Clause
|
||||
Group: Productivity/Networking/Other
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: openldap2-devel
|
||||
BuildRequires: opie
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: postgresql-devel
|
||||
Url: http://asg.web.cmu.edu/sasl/
|
||||
Summary: The SASL Authentication Server
|
||||
License: BSD-4-Clause
|
||||
Group: Productivity/Networking/Other
|
||||
Version: 2.1.25
|
||||
Release: 14
|
||||
Release: 0
|
||||
Source: cyrus-sasl-%{version}.tar.bz2
|
||||
Source1: cyrus-sasl-rc.tar.bz2
|
||||
Source2: README.Source
|
||||
@ -36,6 +41,7 @@ Patch2: cyrus-sasl-gcc4.patch
|
||||
Patch3: cyrus-sasl-gs2-not-overwrite-minor-error-code.dif
|
||||
Patch4: gssapi-null-deref.dif
|
||||
Patch5: cyrus-sasl-no_rpath.patch
|
||||
Patch6: cyrus-sasl-lfs.patch
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -44,7 +50,6 @@ This daemon is required when using cyrus-sasl in server software that
|
||||
should authenticate with PAM, for example.
|
||||
|
||||
%package -n cyrus-sasl-ldap-auxprop
|
||||
License: BSD-4-Clause
|
||||
Summary: The cyrus-sasl LDAP auxprop plugin
|
||||
Group: Productivity/Networking/Other
|
||||
Requires: cyrus-sasl = %{version}
|
||||
@ -54,7 +59,6 @@ The LDAP auxprop plugin allows for tighter application/directory
|
||||
integration.
|
||||
|
||||
%package -n cyrus-sasl-sqlauxprop
|
||||
License: BSD-4-Clause
|
||||
Summary: SQL auxprop plugin for cyrus-sasl
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: cyrus-sasl = %{version}
|
||||
@ -70,7 +74,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%patch6
|
||||
%build
|
||||
find . -name \*.cvsignore -print0 | xargs -0 rm -vf
|
||||
autoreconf -f -i
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 9 21:47:48 UTC 2012 - crrodriguez@opensuse.org
|
||||
|
||||
- Ensure libraries and tools are built with LFS and include
|
||||
config.h in all C files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 4 14:13:36 UTC 2012 - dvaleev@suse.com
|
||||
|
||||
|
||||
@ -16,14 +16,15 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: cyrus-sasl
|
||||
Version: 2.1.25
|
||||
Release: 14
|
||||
BuildRequires: db-devel krb5-mini-devel openssl-devel opie pam-devel
|
||||
Release: 0
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: krb5-mini-devel
|
||||
BuildRequires: libtool
|
||||
License: BSD-4-Clause
|
||||
Group: Productivity/Networking/Other
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: opie
|
||||
BuildRequires: pam-devel
|
||||
Url: http://asg.web.cmu.edu/sasl/
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
@ -31,6 +32,8 @@ Obsoletes: cyrus-sasl-64bit
|
||||
%endif
|
||||
#
|
||||
Summary: Implementation of Cyrus SASL API
|
||||
License: BSD-4-Clause
|
||||
Group: Productivity/Networking/Other
|
||||
Source: cyrus-sasl-%{version}.tar.bz2
|
||||
Source1: cyrus-sasl-rc.tar.bz2
|
||||
Source2: README.Source
|
||||
@ -41,59 +44,51 @@ Patch2: cyrus-sasl-gcc4.patch
|
||||
Patch3: cyrus-sasl-gs2-not-overwrite-minor-error-code.dif
|
||||
Patch4: gssapi-null-deref.dif
|
||||
Patch5: cyrus-sasl-no_rpath.patch
|
||||
Patch6: cyrus-sasl-lfs.patch
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%package gssapi
|
||||
License: BSD-4-Clause
|
||||
Summary: Plugin for the GSSAPI SASL mechanism
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%package crammd5
|
||||
License: BSD-4-Clause
|
||||
Summary: Plugin for the CRAMMD5 SASL mechanism
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%package digestmd5
|
||||
License: BSD-4-Clause
|
||||
Summary: Plugin for the DIGESTMD5 SASL mechanism
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%package otp
|
||||
License: BSD-4-Clause
|
||||
Summary: Plugin for the OTP SASL mechanism
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%package plain
|
||||
License: BSD-4-Clause
|
||||
Summary: Plugin for the PLAIN SASL mechanism
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%package ntlm
|
||||
License: BSD-4-Clause
|
||||
Summary: Plugin for the NTLM SASL mechanism
|
||||
Group: Productivity/Networking/Other
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%package gs2
|
||||
License: BSD-4-Clause
|
||||
Summary: Plugin for the GS2 SASL mechanism
|
||||
Group: Productivity/Networking/Other
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%package scram
|
||||
License: BSD-4-Clause
|
||||
Summary: Plugin for the SCRAM SASL mechanism
|
||||
Group: Productivity/Networking/Other
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%package devel
|
||||
License: BSD-4-Clause
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: cyrus-sasl-devel-64bit
|
||||
@ -101,7 +96,8 @@ Obsoletes: cyrus-sasl-devel-64bit
|
||||
#
|
||||
Summary: Cyrus SASL API Implementation, Libraries and Header Files
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}, glibc-devel
|
||||
Requires: %{name} = %{version}
|
||||
Requires: glibc-devel
|
||||
|
||||
%description
|
||||
This is the Cyrus SASL API. It can be used on the client or server side
|
||||
@ -163,11 +159,11 @@ fi
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%patch6
|
||||
%build
|
||||
find . -name \*.cvsignore -print0 | xargs -0 rm -fv
|
||||
autoreconf -f -i
|
||||
export CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS"
|
||||
export CFLAGS="%optflags -fno-strict-aliasing"
|
||||
%configure --with-pic \
|
||||
--with-plugindir=%{_libdir}/sasl2 \
|
||||
--with-configdir=/etc/sasl2/:%{_libdir}/sasl2 \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user