Browse Source

cleanup config command style, cleanup spec style and remove -Wall -W from build flags as OpenPKG is about packaging, not developing

Ralf S. Engelschall 19 years ago
parent
commit
bf28c1cadb
3 changed files with 50 additions and 37 deletions
  1. 28 18
      sasl/sasl.patch
  2. 5 2
      sasl/sasl.spec
  3. 17 17
      sasl/saslauthd.conf

+ 28 - 18
sasl/sasl.patch

@@ -1,7 +1,17 @@
 Index: configure
---- configure.orig	2006-05-18 21:30:13.000000000 +0200
-+++ configure	2006-09-20 07:42:24.019489745 +0200
-@@ -5125,7 +5125,7 @@
+--- configure.orig	2006-05-18 21:30:13 +0200
++++ configure	2006-12-17 18:35:24 +0100
+@@ -3944,9 +3944,6 @@
+ 
+ fi
+ 
+-if test "$ac_cv_c_compiler_gnu" = yes; then
+-  CFLAGS="-Wall -W ${CFLAGS}"
+-fi
+ 
+ 
+ # Check whether --with-purecov or --without-purecov was given.
+@@ -5125,7 +5122,7 @@
  	fi
  
  	saved_LIBS=$LIBS
@@ -10,7 +20,7 @@ Index: configure
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -5205,6 +5205,54 @@
+@@ -5205,6 +5202,54 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
          fi
@@ -65,7 +75,7 @@ Index: configure
  	LIBS=$saved_LIBS
  
  	LDFLAGS=$BDB_SAVE_LDFLAGS
-@@ -5882,7 +5930,7 @@
+@@ -5882,7 +5927,7 @@
  	fi
  
  	saved_LIBS=$LIBS
@@ -74,7 +84,7 @@ Index: configure
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
-@@ -5962,6 +6010,54 @@
+@@ -5962,6 +6007,54 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
          fi
@@ -130,8 +140,8 @@ Index: configure
  
  	LDFLAGS=$BDB_SAVE_LDFLAGS
 Index: lib/saslint.h
---- lib/saslint.h.orig	2006-04-18 22:25:45.000000000 +0200
-+++ lib/saslint.h	2006-09-20 07:42:24.019997273 +0200
+--- lib/saslint.h.orig	2006-04-18 22:25:45 +0200
++++ lib/saslint.h	2006-12-17 18:35:12 +0100
 @@ -109,8 +109,6 @@
    const char *appname;
  } sasl_global_callbacks_t;
@@ -142,8 +152,8 @@ Index: lib/saslint.h
  {
      sasl_ssf_t ssf;
 Index: lib/server.c
---- lib/server.c.orig	2006-05-17 18:46:13.000000000 +0200
-+++ lib/server.c	2006-09-20 07:42:24.020844262 +0200
+--- lib/server.c.orig	2006-05-17 18:46:13 +0200
++++ lib/server.c	2006-12-17 18:35:12 +0100
 @@ -95,7 +95,7 @@
  
  static mech_list_t *mechlist = NULL; /* global var which holds the list */
@@ -173,8 +183,8 @@ Index: lib/server.c
      next = path_to_config;
  
 Index: sample/client.c
---- sample/client.c.orig	2004-03-09 18:35:32.000000000 +0100
-+++ sample/client.c	2006-09-20 07:42:24.022328546 +0200
+--- sample/client.c.orig	2004-03-09 18:35:32 +0100
++++ sample/client.c	2006-12-17 18:35:12 +0100
 @@ -133,13 +133,11 @@
      return SASL_OK;
  }
@@ -200,8 +210,8 @@ Index: sample/client.c
  	return SASL_FAIL;
  
 Index: sample/sample-client.c
---- sample/sample-client.c.orig	2004-10-26 13:14:33.000000000 +0200
-+++ sample/sample-client.c	2006-09-20 07:42:24.022722474 +0200
+--- sample/sample-client.c.orig	2004-10-26 13:14:33 +0200
++++ sample/sample-client.c	2006-12-17 18:35:12 +0100
 @@ -244,13 +244,11 @@
    return SASL_OK;
  }
@@ -227,8 +237,8 @@ Index: sample/sample-client.c
      return SASL_FAIL;
  
 Index: saslauthd/Makefile.in
---- saslauthd/Makefile.in.orig	2006-05-18 21:30:21.000000000 +0200
-+++ saslauthd/Makefile.in	2006-09-20 07:42:24.021263412 +0200
+--- saslauthd/Makefile.in.orig	2006-05-18 21:30:21 +0200
++++ saslauthd/Makefile.in	2006-12-17 18:35:12 +0100
 @@ -150,11 +150,11 @@
  saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
  saslauthd_LDADD = @SASL_KRB_LIB@ \
@@ -244,8 +254,8 @@ Index: saslauthd/Makefile.in
  saslcache_SOURCES = saslcache.c
  
 Index: saslauthd/lak.c
---- saslauthd/lak.c.orig	2005-05-15 07:49:51.000000000 +0200
-+++ saslauthd/lak.c	2006-09-20 07:42:24.022012854 +0200
+--- saslauthd/lak.c.orig	2005-05-15 07:49:51 +0200
++++ saslauthd/lak.c	2006-12-17 18:35:12 +0100
 @@ -47,6 +47,7 @@
  #include <crypt.h>
  #endif

+ 5 - 2
sasl/sasl.spec

@@ -33,7 +33,7 @@ Class:        BASE
 Group:        Cryptography
 License:      BSD
 Version:      2.1.22
-Release:      20061014
+Release:      20061217
 
 #   package options
 %option       with_fsl    yes
@@ -130,7 +130,7 @@ AutoReqProv:  no
 %if "%{with_ldap}" == "yes"
     echo 'ac_cv_lib_ldap_ldap_initialize=yes' >config.cache
     %{l_shtool} subst \
-        -e "s;\(\$LDAP_LIBS\) *\(-lcrypto\);\1 -lssl \2;" \
+        -e "s;\(\$LDAP_LIBS\) *\(-lcrypto\);\1 -lssl -lcrypto \2;" \
         saslauthd/configure
 %endif
 
@@ -251,14 +251,17 @@ AutoReqProv:  no
         -e 's;^\(deplibs_check_method=\).*;\1"pass_all";' \
         -e 's/\(eval libobjs=.*$whole_archive_flag_spec.*\)$/case $archive_cmds in \\$LD* ) wl= ;; esac; \1/' \
         libtool
+
     #   post adjustment: do not reference static plugins
     %{l_shtool} subst \
         -e '58s;.*;#define PIC;' \
         lib/dlopen.c
+
     #   post adjustment: do not pull static plugins into static library
     %{l_shtool} subst \
         -e 's;-ln -s $(SASL_STATIC_SRCS) .;-ln ../sasldb/*.o ../plugins/*.o $(SASL_STATIC_SRCS) .;' \
         lib/Makefile
+
     #   post adjustment: build utils against static library
     %{l_shtool} subst \
         -e 's;\(\$(CCLD)\);\1 -static;' \

+ 17 - 17
sasl/saslauthd.conf

@@ -2,54 +2,54 @@
 ##  saslauthd.conf -- SASL Authentication Daemon Configuration
 ##
 
-# white space separated list of LDAP servers
+#   white space separated list of LDAP servers
 ldap_servers: ldap://127.0.0.1
 
-# authentication for restricted LDAP servers
+#   authentication for restricted LDAP servers
 #ldap_bind_dn: cn=operator,ou=Profile,o=foo.com
 #ldap_bind_pw: secret
 
-# LDAP version to use (2|3)
+#   LDAP version to use (2|3)
 #ldap_version 3
 
-# LDAP timeout
+#   LDAP timeout
 #ldap_timeout 5
 
-# LDAP aliases (search|find|always|never)
+#   LDAP aliases (search|find|always|never)
 ldap_deref: never
 
-# follow LDAP referrals ?
+#   follow LDAP referrals ?
 ldap_referrals: no
 
-# restart LDAP I/O operations that fail ?
+#   restart LDAP I/O operations that fail ?
 ldap_restart: yes
 
-# search scope (sub|one|base)
+#   search scope (sub|one|base)
 #ldap_scope: sub
 
-# starting point for a search
+#   starting point for a search
 ldap_search_base: MUST-SPECIFY
 
-# authenticate against LDAP (bind|custom|fastbind)
+#   authenticate against LDAP (bind|custom|fastbind)
 ldap_auth_method: bind
 
-# Filter LDAP records, %u = username, %r = realm
-# if ldap_auth_method is 'bind' the filter searches for the DN
-# otherwise the filter searches for the userPassword attribute
+#   Filter LDAP records, %u = username, %r = realm
+#   if ldap_auth_method is 'bind' the filter searches for the DN
+#   otherwise the filter searches for the userPassword attribute
 #ldap_filter: uid=%u
 
-# debugging LDAP operation
+#   debugging LDAP operation
 #ldap_debug 0
 
-# require and verify server certificate
+#   require and verify server certificate
 #ldap_tls_check_peer:  no
 #ldap_tls_cacert_file:
 #ldap_tls_cacert_dir:
 
-# list of SSL/TLS ciphers to allow
+#   list of SSL/TLS ciphers to allow
 #ldap_tls_ciphers: DEFAULT
 
-# files containing client certificate and key
+#   files containing client certificate and key
 #ldap_tls_cert:
 #ldap_tls_key: