wok-next rev 19767
Up e2fsprogs, jfsutils, krb5, cyrus-sasl.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Jun 13 02:43:30 2017 +0300 (2017-06-13) |
| parents | 8f49962222b8 |
| children | d7873beccb0f |
| files | cyrus-sasl-dev/receipt cyrus-sasl/receipt cyrus-sasl/stuff/0027_db5_support.patch cyrus-sasl/stuff/libsasl-modules.files-list cyrus-sasl/stuff/libsasl.files-list cyrus-sasl/stuff/patches/cyrus-sasl-2.1.26-fixes-3.patch cyrus-sasl/stuff/patches/series e2fsprogs/description.txt jfsutils/receipt krb5-clients/receipt krb5-dev/receipt krb5-plugins/receipt krb5-user/receipt krb5/receipt krb5/stuff/krb5-clients.files-list krb5/stuff/krb5-dev.files-list krb5/stuff/krb5-plugins.files-list krb5/stuff/krb5-user.files-list krb5/stuff/libcomerr3.files-list krb5/stuff/libkrb5.files-list krb5/stuff/libkrb5support.files-list libcomerr3/receipt libkrb5/receipt libkrb5support/receipt libsasl-modules/receipt libsasl/receipt |
line diff
1.1 --- a/cyrus-sasl-dev/receipt Mon Jun 12 11:40:38 2017 +0300 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,22 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="cyrus-sasl-dev" 1.7 -VERSION="2.1.23" 1.8 -CATEGORY="network" 1.9 -SHORT_DESC="SASL authentication server development files" 1.10 -MAINTAINER="pascal.bellard@slitaz.org" 1.11 -LICENSE="BSD" 1.12 -WEB_SITE="http://cyrusimap.web.cmu.edu/" 1.13 -WANTED="cyrus-sasl" 1.14 - 1.15 -DEPENDS="cyrus-sasl" 1.16 - 1.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.18 -genpkg_rules() 1.19 -{ 1.20 - mkdir -p $fs/usr/lib/sasl2 1.21 - cp -a $install/usr/include $fs/usr 1.22 - cp -a $install/usr/lib/*a $fs/usr/lib 1.23 - cp -a $install/usr/lib/sasl2/*a $fs/usr/lib/sasl2 1.24 -} 1.25 -
2.1 --- a/cyrus-sasl/receipt Mon Jun 12 11:40:38 2017 +0300 2.2 +++ b/cyrus-sasl/receipt Tue Jun 13 02:43:30 2017 +0300 2.3 @@ -1,43 +1,75 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="cyrus-sasl" 2.8 -VERSION="2.1.23" 2.9 +VERSION="2.1.26" 2.10 CATEGORY="network" 2.11 -SHORT_DESC="SASL authentication server." 2.12 +SHORT_DESC="SASL authentication server" 2.13 MAINTAINER="pascal.bellard@slitaz.org" 2.14 LICENSE="BSD" 2.15 +WEB_SITE="http://cyrusimap.web.cmu.edu/" 2.16 + 2.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.18 -WEB_SITE="http://cyrusimap.web.cmu.edu/" 2.19 -WGET_URL="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$TARBALL" 2.20 +WGET_URL="ftp://ftp.cyrusimap.org/cyrus-sasl/$TARBALL" 2.21 2.22 -DEPENDS="libldap openssl libdb libsasl libsasl-modules libcomerr3" 2.23 -BUILD_DEPENDS="openldap-dev db-dev openssl-dev" 2.24 +BUILD_DEPENDS="automake libtool openldap-dev db-dev openssl-dev krb5-dev" 2.25 +SPLIT="libsasl libsasl-modules cyrus-sasl cyrus-sasl-dev" 2.26 +SIBLINGS="cyrus-sasl-pam libsasl-without-ldap" 2.27 2.28 # Rules to configure and make the package. 2.29 compile_rules() 2.30 { 2.31 - cd $src 2.32 - patch -Np1 -i $stuff/0027_db5_support.patch 2.33 + autoreconf -fi && 2.34 + 2.35 ./configure \ 2.36 - --with-ldap=/usr \ 2.37 - --with-openssl=/usr \ 2.38 + --sysconfdir=/etc \ 2.39 + --enable-auth-sasldb \ 2.40 + --with-dbpath=/var/lib/sasl/sasldb2 \ 2.41 + --with-saslauthd=/var/run/saslauthd \ 2.42 --without-pam \ 2.43 --with-devrandom=/dev/urandom \ 2.44 - $CONFIGURE_ARGS 2.45 - sed -i 's/WITH_DES/WITH_DES 1/' config.h 2.46 - make -j 1 && make install 2.47 + --with-ldap \ 2.48 + --with-openssl \ 2.49 + $CONFIGURE_ARGS && 2.50 + mkdir -p $src/saslauthd/cmulocal && 2.51 + make && make install && 2.52 + 2.53 + docdir="$install/usr/share/doc/cyrus-sasl-$VERSION" 2.54 + mkdir -p $docdir && 2.55 + cd $src/doc && 2.56 + cp *.html *.txt ONEWS TODO ../saslauthd/LDAP_SASLAUTHD $docdir && 2.57 + 2.58 + cp -a $stuff/etc $install && 2.59 + chown -R root:root $install/etc 2.60 } 2.61 2.62 # Rules to gen a SliTaz package suitable for Tazpkg. 2.63 genpkg_rules() 2.64 { 2.65 - mkdir -p $fs/usr/lib/sasl2 $fs/var/state/saslauthd 2.66 - cp -a $install/usr/sbin $fs/usr 2.67 - cp -a $install/usr/lib/*.so* $fs/usr/lib 2.68 - cp -a $install/usr/lib/sasl2/*.so* $fs/usr/lib/sasl2 2.69 - cp -a $stuff/etc $fs 2.70 - 2.71 - cat $stuff/*.files-list | while read file; do 2.72 - rm -rf $fs$file 2.73 - done 2.74 + case $PACKAGE in 2.75 + libsasl) 2.76 + copy libsasl2*.so* 2.77 + CAT="system-tools|library" 2.78 + DEPENDS=" " 2.79 + ;; 2.80 + libsasl-modules) 2.81 + copy sasl2/*.so* 2.82 + CAT="system-tools|library modules" 2.83 + PROVIDE="libsasl-without-ldap" 2.84 + DEPENDS="libcomerr3 libcrypto libdb libkrb5" 2.85 + ;; 2.86 + cyrus-sasl) 2.87 + copy @std 2.88 + remove_already_packed 2.89 + DEPENDS="libcomerr3 libcrypto libdb libkrb5 libldap libsasl \ 2.90 + libsasl-modules libssl" 2.91 + ;; 2.92 + *-dev) 2.93 + copy @dev 2.94 + DEPENDS="db-dev krb5-dev libcrypto-dev" 2.95 + ;; 2.96 + esac 2.97 } 2.98 + 2.99 +post_install_cyrus_sasl() { 2.100 + [ -d "$1/var/lib/sasl" ] || install -v -dm700 "$1/var/lib/sasl" 2.101 +}
3.1 --- a/cyrus-sasl/stuff/0027_db5_support.patch Mon Jun 12 11:40:38 2017 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,24 +0,0 @@ 3.4 -Author: Ondřej Surý <ondrej@debian.org> 3.5 -Description: Support newer Berkeley DB versions 3.6 ---- a/sasldb/db_berkeley.c 3.7 -+++ b/sasldb/db_berkeley.c 3.8 -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut 3.9 - ret = db_create(mbdb, NULL, 0); 3.10 - if (ret == 0 && *mbdb != NULL) 3.11 - { 3.12 --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 3.13 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) 3.14 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); 3.15 - #else 3.16 - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); 3.17 ---- a/utils/dbconverter-2.c 3.18 -+++ b/utils/dbconverter-2.c 3.19 -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p 3.20 - ret = db_create(mbdb, NULL, 0); 3.21 - if (ret == 0 && *mbdb != NULL) 3.22 - { 3.23 --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 3.24 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) 3.25 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); 3.26 - #else 3.27 - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
4.1 --- a/cyrus-sasl/stuff/libsasl-modules.files-list Mon Jun 12 11:40:38 2017 +0300 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,1 +0,0 @@ 4.4 -/usr/lib/sasl2/*.so*
5.1 --- a/cyrus-sasl/stuff/libsasl.files-list Mon Jun 12 11:40:38 2017 +0300 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,1 +0,0 @@ 5.4 -/usr/lib/libsasl2*.so*
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/cyrus-sasl/stuff/patches/cyrus-sasl-2.1.26-fixes-3.patch Tue Jun 13 02:43:30 2017 +0300 6.3 @@ -0,0 +1,774 @@ 6.4 +Submitted By: Armin K. <krejzi at email dot com> 6.5 +Date: 2014-08-24 6.6 +Initial Package Version: 2.1.26 6.7 +Upstream Status: Unknown 6.8 +Origin: Debian and Gentoo 6.9 +Description: Various package fixes, including autotools fixes, plugin fixes, security fixes, parallel build fixes, etc. 6.10 + 6.11 +--- a/cmulocal/sasl2.m4 2012-11-06 20:14:29.000000000 +0100 6.12 ++++ b/cmulocal/sasl2.m4 2014-08-24 00:06:33.965346597 +0200 6.13 +@@ -112,9 +112,6 @@ 6.14 + fi 6.15 + 6.16 + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then 6.17 +- # check for libkrb5support first 6.18 +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) 6.19 +- 6.20 + gss_failed=0 6.21 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, 6.22 + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) 6.23 +@@ -269,6 +266,7 @@ 6.24 + cmu_save_LIBS="$LIBS" 6.25 + LIBS="$LIBS $GSSAPIBASE_LIBS" 6.26 + AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity) 6.27 ++ AC_CHECK_FUNCS(krb5_gss_register_acceptor_identity) 6.28 + AC_CHECK_FUNCS(gss_decapsulate_token) 6.29 + AC_CHECK_FUNCS(gss_encapsulate_token) 6.30 + AC_CHECK_FUNCS(gss_oid_equal) 6.31 +--- a/config/kerberos_v4.m4 2012-01-28 00:31:36.000000000 +0100 6.32 ++++ b/config/kerberos_v4.m4 2014-08-24 00:06:33.968346643 +0200 6.33 +@@ -89,18 +89,18 @@ 6.34 + dnl if we were ambitious, we would look more aggressively for the 6.35 + dnl krb4 install 6.36 + if test -d ${krb4}; then 6.37 +- AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [ 6.38 ++ AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, [ 6.39 + for krbhloc in include/kerberosIV include/kerberos include 6.40 + do 6.41 + if test -f ${krb4}/${krbhloc}/krb.h ; then 6.42 +- cyrus_krbinclude=${krb4}/${krbhloc} 6.43 ++ cyrus_cv_krbinclude=${krb4}/${krbhloc} 6.44 + break 6.45 + fi 6.46 + done 6.47 + ]) 6.48 + 6.49 +- if test -n "${cyrus_krbinclude}"; then 6.50 +- CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}" 6.51 ++ if test -n "${cyrus_cv_krbinclude}"; then 6.52 ++ CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}" 6.53 + fi 6.54 + LDFLAGS="$LDFLAGS -L$krb4/lib" 6.55 + fi 6.56 +--- a/config.h.in 2012-11-06 20:20:59.000000000 +0100 6.57 ++++ b/config.h.in 2014-08-24 00:06:33.969346659 +0200 6.58 +@@ -126,6 +126,10 @@ 6.59 + */ 6.60 + #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 6.61 + 6.62 ++/* Define to 1 if you have the `krb5_gss_register_acceptor_identity' function. 6.63 ++ */ 6.64 ++#undef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY 6.65 ++ 6.66 + /* Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE */ 6.67 + #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE 6.68 + 6.69 +--- a/configure.in 2012-10-12 16:05:48.000000000 +0200 6.70 ++++ b/configure.in 2014-08-24 00:06:46.492540015 +0200 6.71 +@@ -44,6 +44,8 @@ 6.72 + AC_INIT(lib/saslint.h) 6.73 + AC_PREREQ([2.54]) 6.74 + 6.75 ++AC_CONFIG_MACRO_DIR([cmulocal], [config]) 6.76 ++ 6.77 + dnl use ./config.cache as the default cache file. 6.78 + dnl we require a cache file to successfully configure our build. 6.79 + if test $cache_file = "/dev/null"; then 6.80 +@@ -62,9 +64,6 @@ 6.81 + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.26) 6.82 + CMU_INIT_AUTOMAKE 6.83 + 6.84 +-# and include our config dir scripts 6.85 +-ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" 6.86 +- 6.87 + DIRS="" 6.88 + 6.89 + AC_ARG_ENABLE(cmulocal, 6.90 +@@ -861,9 +860,9 @@ 6.91 + notfound) AC_WARN([SQLite Library not found]); true;; 6.92 + *) 6.93 + if test -d ${with_sqlite}/lib; then 6.94 +- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib" 6.95 ++ LIB_SQLITE="-L${with_sqlite}/lib" 6.96 + else 6.97 +- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}" 6.98 ++ LIB_SQLITE="-L${with_sqlite}" 6.99 + fi 6.100 + 6.101 + LIB_SQLITE_DIR=$LIB_SQLITE 6.102 +@@ -913,9 +912,9 @@ 6.103 + notfound) AC_WARN([SQLite3 Library not found]); true;; 6.104 + *) 6.105 + if test -d ${with_sqlite3}/lib; then 6.106 +- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib" 6.107 ++ LIB_SQLITE3="-L${with_sqlite3}/lib" 6.108 + else 6.109 +- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}" 6.110 ++ LIB_SQLITE3="-L${with_sqlite3}" 6.111 + fi 6.112 + 6.113 + LIB_SQLITE3_DIR=$LIB_SQLITE3 6.114 +@@ -1412,10 +1411,9 @@ 6.115 + #endif /* CONFIG_H */ 6.116 + ]) 6.117 + 6.118 +-AM_CONFIG_HEADER(config.h) 6.119 ++AC_CONFIG_HEADERS(config.h) 6.120 + 6.121 + AC_OUTPUT(Makefile 6.122 +-libsasl2.pc 6.123 + include/Makefile 6.124 + sasldb/Makefile 6.125 + plugins/Makefile 6.126 +--- a/include/sasl.h 2012-10-12 16:05:48.000000000 +0200 6.127 ++++ b/include/sasl.h 2014-08-24 00:06:33.970346674 +0200 6.128 +@@ -223,6 +223,8 @@ 6.129 + * they must be called before all other SASL functions: 6.130 + */ 6.131 + 6.132 ++#include <sys/types.h> 6.133 ++ 6.134 + /* memory allocation functions which may optionally be replaced: 6.135 + */ 6.136 + typedef void *sasl_malloc_t(size_t); 6.137 +--- a/java/CyrusSasl/Makefile.am 2012-01-28 00:31:36.000000000 +0100 6.138 ++++ b/java/CyrusSasl/Makefile.am 2014-08-24 00:06:33.970346674 +0200 6.139 +@@ -28,7 +28,7 @@ 6.140 + javasasldir = $(prefix)/lib/java/classes/sasl/CyrusSasl 6.141 + javahtmldir = $(prefix)/html/sasl 6.142 + 6.143 +-INCLUDES=-I$(top_srcdir)/include $(JAVA_INCLUDES) 6.144 ++AM_CPPFLAGS=-I$(top_srcdir)/include $(JAVA_INCLUDES) 6.145 + 6.146 + javasasl_JAVA = Sasl.java GenericClient.java \ 6.147 + ClientFactory.java \ 6.148 +--- a/lib/auxprop.c 2012-01-28 00:31:36.000000000 +0100 6.149 ++++ b/lib/auxprop.c 2014-08-24 00:06:33.971346690 +0200 6.150 +@@ -43,6 +43,7 @@ 6.151 + */ 6.152 + 6.153 + #include <config.h> 6.154 ++#include <stdio.h> 6.155 + #include <sasl.h> 6.156 + #include <prop.h> 6.157 + #include <ctype.h> 6.158 +@@ -970,6 +971,10 @@ 6.159 + } 6.160 + 6.161 + if(!found) { 6.162 ++ /* compatibility with <= 2.1.23, ignore the lack of auxrop plugin */ 6.163 ++ if (!plist) 6.164 ++ result = SASL_OK; 6.165 ++ else 6.166 + _sasl_log(sparams->utils->conn, SASL_LOG_DEBUG, 6.167 + "could not find auxprop plugin, was searching for '%s'", 6.168 + plist ? plist : "[all]"); 6.169 +--- a/lib/dlopen.c 2012-01-28 00:31:36.000000000 +0100 6.170 ++++ b/lib/dlopen.c 2014-08-24 00:06:33.971346690 +0200 6.171 +@@ -247,105 +247,6 @@ 6.172 + return result; 6.173 + } 6.174 + 6.175 +-/* this returns the file to actually open. 6.176 +- * out should be a buffer of size PATH_MAX 6.177 +- * and may be the same as in. */ 6.178 +- 6.179 +-/* We'll use a static buffer for speed unless someone complains */ 6.180 +-#define MAX_LINE 2048 6.181 +- 6.182 +-static int _parse_la(const char *prefix, const char *in, char *out) 6.183 +-{ 6.184 +- FILE *file; 6.185 +- size_t length; 6.186 +- char line[MAX_LINE]; 6.187 +- char *ntmp = NULL; 6.188 +- 6.189 +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; 6.190 +- 6.191 +- /* Set this so we can detect failure */ 6.192 +- *out = '\0'; 6.193 +- 6.194 +- length = strlen(in); 6.195 +- 6.196 +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { 6.197 +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { 6.198 +- /* check for a .la file */ 6.199 +- strcpy(line, prefix); 6.200 +- strcat(line, in); 6.201 +- length = strlen(line); 6.202 +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; 6.203 +- strcat(line, LA_SUFFIX); 6.204 +- file = fopen(line, "r"); 6.205 +- if(file) { 6.206 +- /* We'll get it on the .la open */ 6.207 +- fclose(file); 6.208 +- return SASL_FAIL; 6.209 +- } 6.210 +- } 6.211 +- strcpy(out, prefix); 6.212 +- strcat(out, in); 6.213 +- return SASL_OK; 6.214 +- } 6.215 +- 6.216 +- strcpy(line, prefix); 6.217 +- strcat(line, in); 6.218 +- 6.219 +- file = fopen(line, "r"); 6.220 +- if(!file) { 6.221 +- _sasl_log(NULL, SASL_LOG_WARN, 6.222 +- "unable to open LA file: %s", line); 6.223 +- return SASL_FAIL; 6.224 +- } 6.225 +- 6.226 +- while(!feof(file)) { 6.227 +- if(!fgets(line, MAX_LINE, file)) break; 6.228 +- if(line[strlen(line) - 1] != '\n') { 6.229 +- _sasl_log(NULL, SASL_LOG_WARN, 6.230 +- "LA file has too long of a line: %s", in); 6.231 +- return SASL_BUFOVER; 6.232 +- } 6.233 +- if(line[0] == '\n' || line[0] == '#') continue; 6.234 +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { 6.235 +- /* We found the line with the name in it */ 6.236 +- char *end; 6.237 +- char *start; 6.238 +- size_t len; 6.239 +- end = strrchr(line, '\''); 6.240 +- if(!end) continue; 6.241 +- start = &line[sizeof("dlname=")-1]; 6.242 +- len = strlen(start); 6.243 +- if(len > 3 && start[0] == '\'') { 6.244 +- ntmp=&start[1]; 6.245 +- *end='\0'; 6.246 +- /* Do we have dlname="" ? */ 6.247 +- if(ntmp == end) { 6.248 +- _sasl_log(NULL, SASL_LOG_DEBUG, 6.249 +- "dlname is empty in .la file: %s", in); 6.250 +- return SASL_FAIL; 6.251 +- } 6.252 +- strcpy(out, prefix); 6.253 +- strcat(out, ntmp); 6.254 +- } 6.255 +- break; 6.256 +- } 6.257 +- } 6.258 +- if(ferror(file) || feof(file)) { 6.259 +- _sasl_log(NULL, SASL_LOG_WARN, 6.260 +- "Error reading .la: %s\n", in); 6.261 +- fclose(file); 6.262 +- return SASL_FAIL; 6.263 +- } 6.264 +- fclose(file); 6.265 +- 6.266 +- if(!(*out)) { 6.267 +- _sasl_log(NULL, SASL_LOG_WARN, 6.268 +- "Could not find a dlname line in .la file: %s", in); 6.269 +- return SASL_FAIL; 6.270 +- } 6.271 +- 6.272 +- return SASL_OK; 6.273 +-} 6.274 + #endif /* DO_DLOPEN */ 6.275 + 6.276 + /* loads a plugin library */ 6.277 +@@ -499,18 +400,18 @@ 6.278 + if (length + pos>=PATH_MAX) continue; /* too big */ 6.279 + 6.280 + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), 6.281 +- SO_SUFFIX) 6.282 +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), 6.283 +- LA_SUFFIX)) 6.284 ++ SO_SUFFIX)) 6.285 + continue; 6.286 + 6.287 ++ /* We only use .so files for loading plugins */ 6.288 ++ 6.289 + memcpy(name,dir->d_name,length); 6.290 + name[length]='\0'; 6.291 + 6.292 +- result = _parse_la(prefix, name, tmp); 6.293 +- if(result != SASL_OK) 6.294 +- continue; 6.295 +- 6.296 ++ /* Create full name with path */ 6.297 ++ strncpy(tmp, prefix, PATH_MAX); 6.298 ++ strncat(tmp, name, PATH_MAX); 6.299 ++ 6.300 + /* skip "lib" and cut off suffix -- 6.301 + this only need be approximate */ 6.302 + strcpy(plugname, name + 3); 6.303 +--- a/lib/Makefile.am 2012-10-12 16:05:48.000000000 +0200 6.304 ++++ b/lib/Makefile.am 2014-08-24 00:06:33.971346690 +0200 6.305 +@@ -45,7 +45,7 @@ 6.306 + # CURRENT:REVISION:AGE 6.307 + sasl_version = 3:0:0 6.308 + 6.309 +-INCLUDES=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb 6.310 ++AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb 6.311 + 6.312 + EXTRA_DIST = windlopen.c staticopen.h NTMakefile 6.313 + EXTRA_LIBRARIES = libsasl2.a 6.314 +@@ -64,8 +64,8 @@ 6.315 + lib_LTLIBRARIES = libsasl2.la 6.316 + 6.317 + libsasl2_la_SOURCES = $(common_sources) $(common_headers) 6.318 +-libsasl2_la_LDFLAGS = -version-info $(sasl_version) 6.319 +-libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) 6.320 ++libsasl2_la_LDFLAGS = -version-info $(sasl_version) -Wl,--version-script=$(top_srcdir)/Versions 6.321 ++libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) $(top_srcdir)/Versions 6.322 + libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) 6.323 + 6.324 + if MACOSX 6.325 +@@ -80,7 +80,7 @@ 6.326 + 6.327 + libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) 6.328 + @echo adding static plugins and dependencies 6.329 +- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) 6.330 ++ $(AR) cru $@ $(SASL_STATIC_OBJS) 6.331 + @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ 6.332 + if test ! -f $$i; then continue; fi; . $$i; \ 6.333 + for j in $$dependency_libs foo; do \ 6.334 +--- a/Makefile.am 2012-10-12 16:05:48.000000000 +0200 6.335 ++++ b/Makefile.am 2014-08-24 00:06:46.492540015 +0200 6.336 +@@ -43,6 +43,14 @@ 6.337 + # 6.338 + ################################################################ 6.339 + 6.340 ++do_subst = sed -e 's,[@]LIB_DOOR[@],$(LIB_DOOR),g' \ 6.341 ++ -e 's,[@]SASL_DL_LIB[@],$(SASL_DL_LIB),g' \ 6.342 ++ -e 's,[@]LIBS[@],$(LIBS),g' \ 6.343 ++ -e 's,[@]VERSION[@],$(VERSION),g' \ 6.344 ++ -e 's,[@]libdir[@],$(libdir),g' 6.345 ++ 6.346 ++ACLOCAL_AMFLAGS = -I cmulocal -I config 6.347 ++ 6.348 + if SASLAUTHD 6.349 + SAD = saslauthd 6.350 + else 6.351 +@@ -76,6 +84,10 @@ 6.352 + pkgconfigdir = $(libdir)/pkgconfig 6.353 + pkgconfig_DATA = libsasl2.pc 6.354 + 6.355 ++libsasl2.pc: $(srcdir)/libsasl2.pc.in Makefile 6.356 ++ rm -f $@ 6.357 ++ $(do_subst) < $(srcdir)/libsasl2.pc.in > $@ 6.358 ++ 6.359 + dist-hook: 6.360 + @find $(distdir) -exec chmod o+w {} ';' 6.361 + @find $(distdir) -name CVS -print | xargs -t rm -rf 6.362 +--- a/plugins/gssapi.c 2012-01-28 00:31:36.000000000 +0100 6.363 ++++ b/plugins/gssapi.c 2014-08-24 00:06:33.972346705 +0200 6.364 +@@ -50,6 +50,9 @@ 6.365 + #else 6.366 + #include <gssapi/gssapi.h> 6.367 + #endif 6.368 ++#ifdef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY 6.369 ++#include <gssapi/gssapi_krb5.h> 6.370 ++#endif 6.371 + 6.372 + #ifdef WIN32 6.373 + # include <winsock2.h> 6.374 +@@ -1367,7 +1370,7 @@ 6.375 + }; 6.376 + 6.377 + int gssapiv2_server_plug_init( 6.378 +-#ifndef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 6.379 ++#if !defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) && !defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY) 6.380 + const sasl_utils_t *utils __attribute__((unused)), 6.381 + #else 6.382 + const sasl_utils_t *utils, 6.383 +@@ -1377,7 +1380,7 @@ 6.384 + sasl_server_plug_t **pluglist, 6.385 + int *plugcount) 6.386 + { 6.387 +-#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 6.388 ++#if defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) || defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY) 6.389 + const char *keytab = NULL; 6.390 + char keytab_path[1024]; 6.391 + unsigned int rl; 6.392 +@@ -1387,7 +1390,7 @@ 6.393 + return SASL_BADVERS; 6.394 + } 6.395 + 6.396 +-#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 6.397 ++#if defined(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY) || defined(HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY) 6.398 + /* unfortunately, we don't check for readability of keytab if it's 6.399 + the standard one, since we don't know where it is */ 6.400 + 6.401 +@@ -1410,7 +1413,12 @@ 6.402 + 6.403 + strncpy(keytab_path, keytab, 1024); 6.404 + 6.405 ++#ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 6.406 + gsskrb5_register_acceptor_identity(keytab_path); 6.407 ++#endif 6.408 ++#ifdef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY 6.409 ++ krb5_gss_register_acceptor_identity(keytab_path); 6.410 ++#endif 6.411 + } 6.412 + #endif 6.413 + 6.414 +--- a/plugins/ldapdb.c 2012-01-28 00:31:36.000000000 +0100 6.415 ++++ b/plugins/ldapdb.c 2014-08-24 00:06:33.972346705 +0200 6.416 +@@ -251,6 +251,8 @@ 6.417 + 6.418 + #if defined(LDAP_PROXY_AUTHZ_FAILURE) 6.419 + case LDAP_PROXY_AUTHZ_FAILURE: 6.420 ++#elif defined(LDAP_X_PROXY_AUTHZ_FAILURE) 6.421 ++ case LDAP_X_PROXY_AUTHZ_FAILURE: 6.422 + #endif 6.423 + case LDAP_INAPPROPRIATE_AUTH: 6.424 + case LDAP_INVALID_CREDENTIALS: 6.425 +@@ -404,6 +406,7 @@ 6.426 + if ( len > out_max ) 6.427 + len = out_max; 6.428 + memcpy(out, bvals[0]->bv_val, len); 6.429 ++ out[len] = '\0'; 6.430 + *out_ulen = len; 6.431 + ber_bvecfree(bvals); 6.432 + } 6.433 +--- a/plugins/Makefile.am 2012-10-12 16:05:48.000000000 +0200 6.434 ++++ b/plugins/Makefile.am 2014-08-24 00:06:33.973346721 +0200 6.435 +@@ -49,7 +49,7 @@ 6.436 + # CURRENT:REVISION:AGE 6.437 + plugin_version = 3:0:0 6.438 + 6.439 +-INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include 6.440 ++AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include 6.441 + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version) 6.442 + 6.443 + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ 6.444 +--- a/pwcheck/Makefile.am 2012-01-28 00:31:36.000000000 +0100 6.445 ++++ b/pwcheck/Makefile.am 2014-08-24 00:06:33.973346721 +0200 6.446 +@@ -24,7 +24,7 @@ 6.447 + 6.448 + sbin_PROGRAMS = pwcheck 6.449 + 6.450 +-INCLUDES = -I../include -I../lib 6.451 ++AM_CPPFLAGS = -I../include -I../lib 6.452 + 6.453 + pwcheck_SOURCES = pwcheck.c 6.454 + EXTRA_pwcheck_SOURCES = pwcheck_getpwnam.c pwcheck_getspnam.c 6.455 +--- a/pwcheck/pwcheck_getpwnam.c 2012-01-28 00:31:36.000000000 +0100 6.456 ++++ b/pwcheck/pwcheck_getpwnam.c 2014-08-24 00:06:33.973346721 +0200 6.457 +@@ -32,6 +32,7 @@ 6.458 + char *password; 6.459 + { 6.460 + char* r; 6.461 ++ char* crpt_passwd; 6.462 + struct passwd *pwd; 6.463 + 6.464 + pwd = getpwnam(userid); 6.465 +@@ -41,7 +42,7 @@ 6.466 + else if (pwd->pw_passwd[0] == '*') { 6.467 + r = "Account disabled"; 6.468 + } 6.469 +- else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) { 6.470 ++ else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) { 6.471 + r = "Incorrect password"; 6.472 + } 6.473 + else { 6.474 +--- a/pwcheck/pwcheck_getspnam.c 2012-01-28 00:31:36.000000000 +0100 6.475 ++++ b/pwcheck/pwcheck_getspnam.c 2014-08-24 00:06:33.973346721 +0200 6.476 +@@ -24,6 +24,7 @@ 6.477 + ******************************************************************/ 6.478 + 6.479 + #include <shadow.h> 6.480 ++#include <string.h> 6.481 + 6.482 + extern char *crypt(); 6.483 + 6.484 +@@ -32,13 +33,15 @@ 6.485 + char *password; 6.486 + { 6.487 + struct spwd *pwd; 6.488 ++ char *crpt_passwd; 6.489 + 6.490 + pwd = getspnam(userid); 6.491 + if (!pwd) { 6.492 + return "Userid not found"; 6.493 + } 6.494 + 6.495 +- if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) { 6.496 ++ crpt_passwd = crypt(password, pwd->sp_pwdp); 6.497 ++ if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) { 6.498 + return "Incorrect password"; 6.499 + } 6.500 + else { 6.501 +--- a/sample/Makefile.am 2012-10-16 15:07:55.000000000 +0200 6.502 ++++ b/sample/Makefile.am 2014-08-24 00:06:33.973346721 +0200 6.503 +@@ -42,7 +42,7 @@ 6.504 + # 6.505 + ################################################################ 6.506 + 6.507 +-INCLUDES=-I$(top_srcdir)/include 6.508 ++AM_CPPFLAGS=-I$(top_srcdir)/include 6.509 + 6.510 + noinst_PROGRAMS = client server 6.511 + EXTRA_PROGRAMS = sample-client sample-server 6.512 +--- a/saslauthd/auth_getpwent.c 2012-10-12 16:05:48.000000000 +0200 6.513 ++++ b/saslauthd/auth_getpwent.c 2014-08-24 00:06:33.974346736 +0200 6.514 +@@ -77,6 +77,7 @@ 6.515 + { 6.516 + /* VARIABLES */ 6.517 + struct passwd *pw; /* pointer to passwd file entry */ 6.518 ++ char *crpt_passwd; /* encrypted password */ 6.519 + int errnum; 6.520 + /* END VARIABLES */ 6.521 + 6.522 +@@ -105,7 +106,8 @@ 6.523 + } 6.524 + } 6.525 + 6.526 +- if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) { 6.527 ++ crpt_passwd = crypt(password, pw->pw_passwd); 6.528 ++ if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) { 6.529 + if (flags & VERBOSE) { 6.530 + syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login); 6.531 + } 6.532 +--- a/saslauthd/auth_rimap.c 2012-10-12 16:05:48.000000000 +0200 6.533 ++++ b/saslauthd/auth_rimap.c 2014-08-24 00:06:33.974346736 +0200 6.534 +@@ -90,6 +90,7 @@ 6.535 + service we connect to. */ 6.536 + #define TAG "saslauthd" /* IMAP command tag */ 6.537 + #define LOGIN_CMD (TAG " LOGIN ") /* IMAP login command (with tag) */ 6.538 ++#define LOGOUT_CMD (TAG " LOGOUT ") /* IMAP logout command (with tag)*/ 6.539 + #define NETWORK_IO_TIMEOUT 30 /* network I/O timeout (seconds) */ 6.540 + #define RESP_LEN 1000 /* size of read response buffer */ 6.541 + 6.542 +@@ -307,10 +308,12 @@ 6.543 + int s=-1; /* socket to remote auth host */ 6.544 + struct addrinfo *r; /* remote socket address info */ 6.545 + struct iovec iov[5]; /* for sending LOGIN command */ 6.546 ++ struct iovec iov2[1]; /* for sending LOGOUT command */ 6.547 + char *qlogin; /* pointer to "quoted" login */ 6.548 + char *qpass; /* pointer to "quoted" password */ 6.549 + char *c; /* scratch pointer */ 6.550 + int rc; /* return code scratch area */ 6.551 ++ int rcl; /* return code scratch area */ 6.552 + char rbuf[RESP_LEN]; /* response read buffer */ 6.553 + char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV]; 6.554 + int saved_errno; 6.555 +@@ -505,6 +508,24 @@ 6.556 + } 6.557 + } 6.558 + } 6.559 ++ 6.560 ++ /* close remote imap */ 6.561 ++ iov2[0].iov_base = LOGOUT_CMD; 6.562 ++ iov2[0].iov_len = sizeof(LOGOUT_CMD) - 1; 6.563 ++ iov2[1].iov_base = "\r\n"; 6.564 ++ iov2[1].iov_len = sizeof("\r\n") - 1; 6.565 ++ 6.566 ++ if (flags & VERBOSE) { 6.567 ++ syslog(LOG_DEBUG, "auth_rimap: sending %s%s %s", 6.568 ++ LOGOUT_CMD, qlogin, qpass); 6.569 ++ } 6.570 ++ alarm(NETWORK_IO_TIMEOUT); 6.571 ++ rcl = retry_writev(s, iov2, 2); 6.572 ++ alarm(0); 6.573 ++ if (rcl == -1) { 6.574 ++ syslog(LOG_WARNING, "auth_rimap: writev logout: %m"); 6.575 ++ } 6.576 ++ 6.577 + (void) close(s); /* we're done with the remote */ 6.578 + if (rc == -1) { 6.579 + syslog(LOG_WARNING, "auth_rimap: read (response): %m"); 6.580 +--- a/saslauthd/auth_shadow.c 2012-10-12 16:05:48.000000000 +0200 6.581 ++++ b/saslauthd/auth_shadow.c 2014-08-24 00:06:33.974346736 +0200 6.582 +@@ -210,8 +210,8 @@ 6.583 + RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)"); 6.584 + } 6.585 + 6.586 +- cpw = strdup((const char *)crypt(password, sp->sp_pwdp)); 6.587 +- if (strcmp(sp->sp_pwdp, cpw)) { 6.588 ++ cpw = crypt(password, sp->sp_pwdp); 6.589 ++ if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) { 6.590 + if (flags & VERBOSE) { 6.591 + /* 6.592 + * This _should_ reveal the SHADOW_PW_LOCKED prefix to an 6.593 +@@ -221,10 +221,8 @@ 6.594 + syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'", 6.595 + sp->sp_pwdp, cpw); 6.596 + } 6.597 +- free(cpw); 6.598 + RETURN("NO Incorrect password"); 6.599 + } 6.600 +- free(cpw); 6.601 + 6.602 + /* 6.603 + * The following fields will be set to -1 if: 6.604 +@@ -286,7 +284,7 @@ 6.605 + RETURN("NO Invalid username"); 6.606 + } 6.607 + 6.608 +- if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) { 6.609 ++ if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) { 6.610 + if (flags & VERBOSE) { 6.611 + syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s", 6.612 + password, upw->upw_passwd); 6.613 +--- a/saslauthd/configure.in 2012-10-12 16:05:48.000000000 +0200 6.614 ++++ b/saslauthd/configure.in 2014-08-24 00:06:33.975346752 +0200 6.615 +@@ -1,7 +1,8 @@ 6.616 + AC_INIT(mechanisms.h) 6.617 + AC_PREREQ([2.54]) 6.618 + 6.619 +-AC_CONFIG_AUX_DIR(config) 6.620 ++AC_CONFIG_MACRO_DIR([../cmulocal], [../config]) 6.621 ++AC_CONFIG_AUX_DIR([config]) 6.622 + AC_CANONICAL_HOST 6.623 + 6.624 + dnl Should we enable SASLAUTHd at all? 6.625 +@@ -25,6 +26,7 @@ 6.626 + AC_PROG_MAKE_SET 6.627 + AC_PROG_LN_S 6.628 + AC_PROG_INSTALL 6.629 ++AC_PROG_LIBTOOL 6.630 + 6.631 + dnl Checks for build foo 6.632 + CMU_C___ATTRIBUTE__ 6.633 +@@ -77,7 +79,7 @@ 6.634 + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) 6.635 + SASL_DB_PATH_CHECK() 6.636 + SASL_DB_CHECK() 6.637 +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" 6.638 ++ SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a" 6.639 + fi 6.640 + 6.641 + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], 6.642 +@@ -163,30 +165,30 @@ 6.643 + 6.644 + dnl Checks for which function macros exist 6.645 + AC_MSG_CHECKING(whether $CC implements __func__) 6.646 +-AC_CACHE_VAL(have_func, 6.647 ++AC_CACHE_VAL(_cv_have_func, 6.648 + [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __func__);], 6.649 +-have_func=yes, 6.650 +-have_func=no)]) 6.651 +-AC_MSG_RESULT($have_func) 6.652 +-if test "$have_func" = yes; then 6.653 ++_cv_have_func=yes, 6.654 ++_cv_have_func=no)]) 6.655 ++AC_MSG_RESULT($_cv_have_func) 6.656 ++if test "$_cv_have_func" = yes; then 6.657 + AC_DEFINE(HAVE_FUNC,[],[Does the compiler understand __func__]) 6.658 + else 6.659 + AC_MSG_CHECKING(whether $CC implements __PRETTY_FUNCTION__) 6.660 +- AC_CACHE_VAL(have_pretty_function, 6.661 ++ AC_CACHE_VAL(_cv_have_pretty_function, 6.662 + [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __PRETTY_FUNCTION__);], 6.663 +- have_pretty_function=yes, 6.664 +- have_pretty_function=no)]) 6.665 +- AC_MSG_RESULT($have_pretty_function) 6.666 +- if test "$have_pretty_function" = yes; then 6.667 ++ _cv_have_pretty_function=yes, 6.668 ++ _cv_have_pretty_function=no)]) 6.669 ++ AC_MSG_RESULT($_cv_have_pretty_function) 6.670 ++ if test "$_cv_have_pretty_function" = yes; then 6.671 + AC_DEFINE(HAVE_PRETTY_FUNCTION,[],[Does compiler understand __PRETTY_FUNCTION__]) 6.672 + else 6.673 + AC_MSG_CHECKING(whether $CC implements __FUNCTION__) 6.674 +- AC_CACHE_VAL(have_function, 6.675 ++ AC_CACHE_VAL(_cv_have_function, 6.676 + [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __FUNCTION__);], 6.677 +- have_function=yes, 6.678 +- have_function=no)]) 6.679 +- AC_MSG_RESULT($have_function) 6.680 +- if test "$have_function" = yes; then 6.681 ++ _cv_have_function=yes, 6.682 ++ _cv_have_function=no)]) 6.683 ++ AC_MSG_RESULT($_cv_have_function) 6.684 ++ if test "$_cv_have_function" = yes; then 6.685 + AC_DEFINE(HAVE_FUNCTION,[],[Does compiler understand __FUNCTION__]) 6.686 + fi 6.687 + fi 6.688 +--- a/saslauthd/Makefile.am 2012-01-28 00:31:36.000000000 +0100 6.689 ++++ b/saslauthd/Makefile.am 2014-08-24 00:06:33.975346752 +0200 6.690 +@@ -1,4 +1,6 @@ 6.691 + AUTOMAKE_OPTIONS = 1.7 6.692 ++ACLOCAL_AMFLAGS = -I ../cmulocal -I ../config 6.693 ++ 6.694 + sbin_PROGRAMS = saslauthd testsaslauthd 6.695 + EXTRA_PROGRAMS = saslcache 6.696 + 6.697 +@@ -16,7 +18,7 @@ 6.698 + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ 6.699 + saslauthd_LDADD = @SASL_KRB_LIB@ \ 6.700 + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ 6.701 +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ 6.702 ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ 6.703 + 6.704 + testsaslauthd_SOURCES = testsaslauthd.c utils.c 6.705 + testsaslauthd_LDADD = @LIB_SOCKET@ 6.706 +@@ -25,7 +27,7 @@ 6.707 + 6.708 + EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include \ 6.709 + getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD 6.710 +-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include 6.711 ++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include 6.712 + DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I.. 6.713 + 6.714 + 6.715 +--- a/saslauthd/saslauthd.h.in 2012-11-06 20:21:43.000000000 +0100 6.716 ++++ b/saslauthd/saslauthd.h.in 2014-08-24 00:06:33.975346752 +0200 6.717 +@@ -62,6 +62,10 @@ 6.718 + */ 6.719 + #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 6.720 + 6.721 ++/* Define to 1 if you have the `krb5_gss_register_acceptor_identity' function. 6.722 ++ */ 6.723 ++#undef HAVE_KRB5_GSS_REGISTER_ACCEPTOR_IDENTITY 6.724 ++ 6.725 + /* Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE */ 6.726 + #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE 6.727 + 6.728 +--- a/sasldb/Makefile.am 2012-01-28 00:31:36.000000000 +0100 6.729 ++++ b/sasldb/Makefile.am 2014-08-24 00:06:33.975346752 +0200 6.730 +@@ -44,7 +44,7 @@ 6.731 + # Note that this doesn't necessaraly follow the libsasl2 verison info 6.732 + sasl_version = 1:25:0 6.733 + 6.734 +-INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ 6.735 ++AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ 6.736 + 6.737 + extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c 6.738 + 6.739 +@@ -55,14 +55,14 @@ 6.740 + 6.741 + libsasldb_la_SOURCES = allockey.c sasldb.h 6.742 + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) 6.743 +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) 6.744 +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 6.745 ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) 6.746 ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) 6.747 + 6.748 + # Prevent make dist stupidity 6.749 + libsasldb_a_SOURCES = 6.750 + EXTRA_libsasldb_a_SOURCES = 6.751 + 6.752 + libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) 6.753 +- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) 6.754 ++ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC) 6.755 + 6.756 + 6.757 +--- a/utils/Makefile.am 2012-01-28 00:31:36.000000000 +0100 6.758 ++++ b/utils/Makefile.am 2014-08-24 00:06:33.976346767 +0200 6.759 +@@ -89,7 +89,7 @@ 6.760 + libsfsasl2_la_LIBADD = sfsasl.lo 6.761 + libsfsasl2_la_LDFLAGS = -version-info 1:0:0 -export-dynamic -rpath $(libdir) 6.762 + 6.763 +-INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ 6.764 ++AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ 6.765 + EXTRA_DIST = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8 sfsasl.h sfsasl.c smtptest.c testsuite.c pluginviewer.c NTMakefile 6.766 + 6.767 + sfsasl.lo: sfsasl.c 6.768 +--- a/Versions 1970-01-01 01:00:00.000000000 +0100 6.769 ++++ b/Versions 2014-08-24 00:06:33.976346767 +0200 6.770 +@@ -0,0 +1,7 @@ 6.771 ++SASL2 { 6.772 ++ global: 6.773 ++ sasl_*; prop_*; auxprop_plugin_info; _sasl_MD5*; 6.774 ++}; 6.775 ++ 6.776 ++HIDDEN { local: __*; _rest*; _save*; *; }; 6.777 ++
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/cyrus-sasl/stuff/patches/series Tue Jun 13 02:43:30 2017 +0300 7.3 @@ -0,0 +1,1 @@ 7.4 +cyrus-sasl-2.1.26-fixes-3.patch
8.1 --- a/e2fsprogs/description.txt Mon Jun 12 11:40:38 2017 +0300 8.2 +++ b/e2fsprogs/description.txt Tue Jun 13 02:43:30 2017 +0300 8.3 @@ -1,2 +1,2 @@ 8.4 -E2fsprogs provides the filesystem utilities for use with the ext2 filesystem. It 8.5 -also supports the ext3 and ext4 filesystems. 8.6 +The Ext2 Filesystem Utilities (e2fsprogs) contain all of the standard utilities 8.7 +for creating, fixing, configuring, and debugging ext2 filesystems.
9.1 --- a/jfsutils/receipt Mon Jun 12 11:40:38 2017 +0300 9.2 +++ b/jfsutils/receipt Tue Jun 13 02:43:30 2017 +0300 9.3 @@ -1,33 +1,30 @@ 9.4 -# SliTaz package receipt. 9.5 +# SliTaz package receipt v2. 9.6 9.7 PACKAGE="jfsutils" 9.8 -VERSION="1.1.14" 9.9 +VERSION="1.1.15" 9.10 CATEGORY="system-tools" 9.11 -SHORT_DESC="Utilities for manipulating jfs file-system." 9.12 +SHORT_DESC="Utilities for manipulating jfs file-system" 9.13 MAINTAINER="pascal.bellard@slitaz.org" 9.14 LICENSE="GPL3" 9.15 +WEB_SITE="http://jfs.sourceforge.net/" 9.16 + 9.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 9.18 -WEB_SITE="http://jfs.sourceforge.net/" 9.19 WGET_URL="${WEB_SITE}project/pub/$TARBALL" 9.20 -TAGS="filesystem" 9.21 9.22 -DEPENDS="util-linux-uuid" 9.23 BUILD_DEPENDS="util-linux-uuid-dev" 9.24 9.25 # Rules to configure and make the package. 9.26 compile_rules() 9.27 { 9.28 - cd $src 9.29 - ./configure --prefix=/usr --infodir=/usr/share/info \ 9.30 - --mandir=/usr/share/man $CONFIGURE_ARGS && 9.31 - make && 9.32 - make DESTDIR=$DESTDIR install 9.33 + sed "s@<unistd.h>@&\n#include <sys/types.h>@g" -i fscklog/extract.c && 9.34 + 9.35 + ./configure $CONFIGURE_ARGS && make && make install 9.36 } 9.37 9.38 # Rules to gen a SliTaz package suitable for Tazpkg. 9.39 genpkg_rules() 9.40 { 9.41 - mkdir -p $fs/usr 9.42 - cp -a $install/usr/sbin $fs/usr 9.43 + copy @std 9.44 + DEPENDS="util-linux-uuid" 9.45 + TAGS="filesystem" 9.46 } 9.47 -
10.1 --- a/krb5-clients/receipt Mon Jun 12 11:40:38 2017 +0300 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,23 +0,0 @@ 10.4 -# SliTaz package receipt. 10.5 - 10.6 -PACKAGE="krb5-clients" 10.7 -VERSION="1.10.3" 10.8 -CATEGORY="security" 10.9 -SHORT_DESC="Misc clients using MIT Kerberos." 10.10 -MAINTAINER="pascal.bellard@slitaz.org" 10.11 -LICENSE="MIT" 10.12 -WEB_SITE="http://web.mit.edu/Kerberos/" 10.13 -WANTED="krb5" 10.14 - 10.15 -DEPENDS="libkrb5" 10.16 - 10.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 10.18 -genpkg_rules() 10.19 -{ 10.20 - while read file; do 10.21 - dir=$(dirname $file) 10.22 - [ -d $fs$dir ] || mkdir -p $fs$dir 10.23 - cp -a $install$file $fs$dir 10.24 - done < $wanted_stuff/$PACKAGE.files-list 10.25 -} 10.26 -
11.1 --- a/krb5-dev/receipt Mon Jun 12 11:40:38 2017 +0300 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,23 +0,0 @@ 11.4 -# SliTaz package receipt. 11.5 - 11.6 -PACKAGE="krb5-dev" 11.7 -VERSION="1.10.3" 11.8 -CATEGORY="development" 11.9 -SHORT_DESC="Network authentication protocol development files." 11.10 -MAINTAINER="pascal.bellard@slitaz.org" 11.11 -LICENSE="MIT" 11.12 -WEB_SITE="http://web.mit.edu/Kerberos/" 11.13 -WANTED="krb5" 11.14 - 11.15 -DEPENDS="libkrb5" 11.16 - 11.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 11.18 -genpkg_rules() 11.19 -{ 11.20 - while read file; do 11.21 - dir=$(dirname $file) 11.22 - [ -d $fs$dir ] || mkdir -p $fs$dir 11.23 - cp -a $install$file $fs$dir 11.24 - done < $wanted_stuff/$PACKAGE.files-list 11.25 -} 11.26 -
12.1 --- a/krb5-plugins/receipt Mon Jun 12 11:40:38 2017 +0300 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,23 +0,0 @@ 12.4 -# SliTaz package receipt. 12.5 - 12.6 -PACKAGE="krb5-plugins" 12.7 -VERSION="1.10.3" 12.8 -CATEGORY="security" 12.9 -SHORT_DESC="Plugins for MIT Kerberos." 12.10 -MAINTAINER="pascal.bellard@slitaz.org" 12.11 -LICENSE="MIT" 12.12 -WEB_SITE="http://web.mit.edu/Kerberos/" 12.13 -WANTED="krb5" 12.14 - 12.15 -DEPENDS="krb5 libcrypto" 12.16 - 12.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 12.18 -genpkg_rules() 12.19 -{ 12.20 - while read file; do 12.21 - dir=$(dirname $file) 12.22 - [ -d $fs$dir ] || mkdir -p $fs$dir 12.23 - cp -a $install$file $fs$dir 12.24 - done < $wanted_stuff/$PACKAGE.files-list 12.25 -} 12.26 -
13.1 --- a/krb5-user/receipt Mon Jun 12 11:40:38 2017 +0300 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,23 +0,0 @@ 13.4 -# SliTaz package receipt. 13.5 - 13.6 -PACKAGE="krb5-user" 13.7 -VERSION="1.10.3" 13.8 -CATEGORY="security" 13.9 -SHORT_DESC="Basic programs to authenticate using MIT Kerberos." 13.10 -MAINTAINER="pascal.bellard@slitaz.org" 13.11 -LICENSE="MIT" 13.12 -WEB_SITE="http://web.mit.edu/Kerberos/" 13.13 -WANTED="krb5" 13.14 - 13.15 -DEPENDS="krb5" 13.16 - 13.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 13.18 -genpkg_rules() 13.19 -{ 13.20 - while read file; do 13.21 - dir=$(dirname $file) 13.22 - [ -d $fs$dir ] || mkdir -p $fs$dir 13.23 - cp -a $install$file $fs$dir 13.24 - done < $wanted_stuff/$PACKAGE.files-list 13.25 -} 13.26 -
14.1 --- a/krb5/receipt Mon Jun 12 11:40:38 2017 +0300 14.2 +++ b/krb5/receipt Tue Jun 13 02:43:30 2017 +0300 14.3 @@ -1,66 +1,135 @@ 14.4 -# SliTaz package receipt. 14.5 +# SliTaz package receipt v2. 14.6 14.7 PACKAGE="krb5" 14.8 VERSION="1.15.1" 14.9 CATEGORY="security" 14.10 -SHORT_DESC="Network authentication protocol with strong authentication." 14.11 +SHORT_DESC="Network authentication protocol" 14.12 MAINTAINER="pascal.bellard@slitaz.org" 14.13 LICENSE="MIT" 14.14 +WEB_SITE="http://web.mit.edu/Kerberos/" 14.15 + 14.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 14.17 -WEB_SITE="http://web.mit.edu/Kerberos/" 14.18 -WGET_URL="${WEB_SITE}dist/$PACKAGE/${VERSION:0:4}/$TARBALL" 14.19 -CONFIG_FILES="/etc/krb5" 14.20 -CFLAGS="-march=$ARCH -O2 -pipe -fomit-frame-pointer" 14.21 -CXXFLAGS="$CFLAGS" 14.22 +WGET_URL="http://web.mit.edu/kerberos/dist/krb5/${VERSION%.*}/$TARBALL" 14.23 14.24 -DEPENDS="libkrb5" 14.25 -BUILD_DEPENDS="perl bison gettext openssl-dev" 14.26 +BUILD_DEPENDS="automake perl gettext openssl-dev" 14.27 +SPLIT="krb5-plugins krb5-clients krb5-user libcomerr3 libkrb5 libkrb5support \ 14.28 +krb5 krb5-dev" 14.29 14.30 # Rules to configure and make the package. 14.31 compile_rules() 14.32 { 14.33 -# srcdir=$PACKAGE-$VERSION 14.34 -# [ -d $src/src ] || tar xzf $src/$srcdir.tar.gz 14.35 -# # This is for cookutils. If more than one file was extracted it create 14.36 -# # $PACKAGE-$VERSION to move files in it. Krb5 is the only package like 14.37 -# # that so we do the trick here. 14.38 -# if [ -d "$srcdir" -a -x /usr/bin/cook ]; then 14.39 -# mv $srcdir $CACHE && cd .. && rm -rf * && mv -f $CACHE/$srcdir . 14.40 -# else 14.41 -# mv $srcdir/* . 14.42 -# fi 14.43 - cd $src/src 14.44 + CFLAGS="-march=$ARCH -O2 -pipe -fomit-frame-pointer" 14.45 + CXXFLAGS="$CFLAGS" 14.46 14.47 - # FS#25384 14.48 - sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 14.49 + cd src && 14.50 14.51 - ./configure --localstatedir=/var $CONFIGURE_ARGS && 14.52 - make $MAKEFLAGS && make install 14.53 + sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \ 14.54 + -e "s@-lpython2.5]@&,\n AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \ 14.55 + -i configure.in && 14.56 + 14.57 + sed -e 's@\^u}@^u cols 300}@' \ 14.58 + -i tests/dejagnu/config/default.exp && 14.59 + 14.60 + sed -e '/eq 0/{N;s/12 //}' \ 14.61 + -i plugins/kdb/db2/libdb2/test/run.test && 14.62 + 14.63 + autoconf && 14.64 + ./configure \ 14.65 + --sysconfdir=/etc \ 14.66 + --localstatedir=/var/lib \ 14.67 + --with-system-et=no \ 14.68 + --with-system-ss=no \ 14.69 + --with-system-verto=no \ 14.70 + --enable-dns-for-realm \ 14.71 + $CONFIGURE_ARGS && 14.72 + make $MAKEFLAGS && 14.73 + make install && 14.74 + 14.75 + for f in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \ 14.76 + kdb5 kdb_ldap krad krb5 krb5support verto; do 14.77 + find $install/usr/lib -type f -name "lib$f*.so*" -exec chmod -v 755 '{}' \; 14.78 + done && 14.79 + 14.80 + mkdir -p $install/lib && 14.81 + mv -v $install/usr/lib/libkrb5.so.3* $install/lib && 14.82 + mv -v $install/usr/lib/libk5crypto.so.3* $install/lib && 14.83 + mv -v $install/usr/lib/libkrb5support.so.0* $install/lib && 14.84 + 14.85 + ln -v -sf ../../lib/libkrb5.so.3.3 $install/usr/lib/libkrb5.so && 14.86 + ln -v -sf ../../lib/libk5crypto.so.3.1 $install/usr/lib/libk5crypto.so && 14.87 + ln -v -sf ../../lib/libkrb5support.so.0.1 $install/usr/lib/libkrb5support.so && 14.88 + 14.89 + mkdir -p $install/bin && 14.90 + mv -v $install/usr/bin/ksu $install/bin && 14.91 + chmod -v 755 $install/bin/ksu && 14.92 + 14.93 + chmod -v 755 $install/usr/lib/libcom_err.so.3.0 && 14.94 + find $install/usr/lib/krb5/plugins -name '*.so' -exec chmod 755 '{}' \; && 14.95 + 14.96 + mkdir -p $install/etc && 14.97 + touch $install/etc/krb5.conf && 14.98 + 14.99 + install -v -dm755 $install/usr/share/doc/krb5-$VERSION && 14.100 + cp -vfr ../doc/* $install/usr/share/doc/krb5-$VERSION 14.101 } 14.102 14.103 # Rules to gen a SliTaz package suitable for Tazpkg. 14.104 genpkg_rules() 14.105 { 14.106 - mkdir -p $fs/usr $fs/etc 14.107 - cp -a $install/usr/share/examples/krb5 $fs/etc 14.108 - cp -a $install/usr/bin $fs/usr 14.109 - cp -a $install/usr/sbin $fs/usr 14.110 - cp -a $install/usr/lib $fs/usr 14.111 - cat $stuff/*.files-list | while read file; do 14.112 - rm -rf ${fs}$file 14.113 - done 14.114 + case $PACKAGE in 14.115 + krb5-plugins) 14.116 + copy plugins/ 14.117 + CAT="security|plugins" 14.118 + DEPENDS="krb5 libcomerr3 libkrb5support libcrypto libkrb5 libssl" 14.119 + ;; 14.120 + krb5-clients) 14.121 + copy gss-client sclient sim_client uuclient 14.122 + CAT="security|misc clients" 14.123 + DEPENDS="libcomerr3 libkrb5support libkrb5" 14.124 + ;; 14.125 + krb5-user) 14.126 + copy k5srvutil kadmin kdestroy kinit klist kpasswd ksu kvno 14.127 + CAT="security|basic programs to authenticate" 14.128 + DEPENDS="krb5 libcomerr3 libkrb5support libkrb5" 14.129 + ;; 14.130 + libcomerr3) 14.131 + copy libcom_err.so* 14.132 + CAT="security|the libcomerr v3 library" 14.133 + PROVIDE="libcomerr" 14.134 + DEPENDS="libkrb5support" 14.135 + ;; 14.136 + libkrb5) 14.137 + copy libgssrpc.so* libk5crypto.so* libkrb5.so* libgssapi_krb5.so* \ 14.138 + libkdb5.so* 14.139 + CAT="security|libraries" 14.140 + DEPENDS="libcomerr3 libkrb5support" 14.141 + ;; 14.142 + libkrb5support) 14.143 + copy libkrb5support.so* 14.144 + CAT="security|support libraries" 14.145 + DEPENDS=" " 14.146 + ;; 14.147 + krb5) 14.148 + copy @std 14.149 + remove_already_packed 14.150 + DEPENDS="libcomerr3 libkrb5support libkrb5" 14.151 + CONFIG_FILES="/etc/krb5.conf" 14.152 + ;; 14.153 + krb5-dev) 14.154 + copy @dev 14.155 + ;; 14.156 + esac 14.157 } 14.158 14.159 # Pre and post install commands for Tazpkg. 14.160 -post_install() 14.161 -{ 14.162 - [ -z "$quiet" ] && cat <<EOF 14.163 +post_install_krb5() { 14.164 + [ -n "$quiet" ] || cat <<EOF 14.165 ---- 14.166 -To start $PACKAGE server you can run: 14.167 +To start krb5 server you can run: 14.168 14.169 - /etc/init.d/$PACKAGE start 14.170 + /etc/init.d/krb5 start 14.171 14.172 -Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf 14.173 +Or add krb5 to RUN_DAEMONS in /etc/rcS.conf 14.174 ---- 14.175 EOF 14.176 }
15.1 --- a/krb5/stuff/krb5-clients.files-list Mon Jun 12 11:40:38 2017 +0300 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,4 +0,0 @@ 15.4 -/usr/bin/sclient 15.5 -/usr/bin/sim_client 15.6 -/usr/bin/uuclient 15.7 -/usr/bin/gss-client
16.1 --- a/krb5/stuff/krb5-dev.files-list Mon Jun 12 11:40:38 2017 +0300 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,1 +0,0 @@ 16.4 -/usr/include
17.1 --- a/krb5/stuff/krb5-plugins.files-list Mon Jun 12 11:40:38 2017 +0300 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,1 +0,0 @@ 17.4 -/usr/lib/krb5/plugins
18.1 --- a/krb5/stuff/krb5-user.files-list Mon Jun 12 11:40:38 2017 +0300 18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 18.3 @@ -1,8 +0,0 @@ 18.4 -/usr/bin/kdestroy 18.5 -/usr/bin/kinit 18.6 -/usr/bin/klist 18.7 -/usr/bin/kpasswd 18.8 -/usr/bin/ksu 18.9 -/usr/bin/kvno 18.10 -/usr/bin/k5srvutil 18.11 -/usr/bin/kadmin
19.1 --- a/krb5/stuff/libcomerr3.files-list Mon Jun 12 11:40:38 2017 +0300 19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 19.3 @@ -1,2 +0,0 @@ 19.4 -/usr/lib/libkrb5support.so* 19.5 -/usr/lib/libcom_err.so*
20.1 --- a/krb5/stuff/libkrb5.files-list Mon Jun 12 11:40:38 2017 +0300 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,4 +0,0 @@ 20.4 -/usr/lib/libk5crypto.so* 20.5 -/usr/lib/libkrb5.so* 20.6 -/usr/lib/libgssapi_krb5.so* 20.7 -/usr/lib/libkdb5.so*
21.1 --- a/krb5/stuff/libkrb5support.files-list Mon Jun 12 11:40:38 2017 +0300 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,1 +0,0 @@ 21.4 -/usr/lib/libkrb5support.so*
22.1 --- a/libcomerr3/receipt Mon Jun 12 11:40:38 2017 +0300 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,24 +0,0 @@ 22.4 -# SliTaz package receipt. 22.5 - 22.6 -PACKAGE="libcomerr3" 22.7 -VERSION="1.10.3" 22.8 -CATEGORY="security" 22.9 -SHORT_DESC="The libcomerr v3 library files." 22.10 -MAINTAINER="erjo@slitaz.org" 22.11 -LICENSE="MIT" 22.12 -WEB_SITE="http://web.mit.edu/Kerberos/" 22.13 -WANTED="krb5" 22.14 -PROVIDE="libcomerr" 22.15 - 22.16 -DEPENDS="libkrb5support" 22.17 - 22.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 22.19 -genpkg_rules() 22.20 -{ 22.21 - while read file; do 22.22 - dir=$(dirname "$file") 22.23 - [ -d $fs$dir ] || mkdir -p $fs$dir 22.24 - cp -a $install$file $fs$dir 22.25 - chmod +x $fs$file 22.26 - done < $wanted_stuff/$PACKAGE.files-list 22.27 -}
23.1 --- a/libkrb5/receipt Mon Jun 12 11:40:38 2017 +0300 23.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 23.3 @@ -1,23 +0,0 @@ 23.4 -# SliTaz package receipt. 23.5 - 23.6 -PACKAGE="libkrb5" 23.7 -VERSION="1.10.3" 23.8 -CATEGORY="security" 23.9 -SHORT_DESC="Kerberos network authentication protocol libraries." 23.10 -MAINTAINER="pascal.bellard@slitaz.org" 23.11 -LICENSE="MIT" 23.12 -WEB_SITE="http://web.mit.edu/Kerberos/" 23.13 -WANTED="krb5" 23.14 - 23.15 -DEPENDS="libkrb5support libcomerr3" 23.16 - 23.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 23.18 -genpkg_rules() 23.19 -{ 23.20 - while read file; do 23.21 - dir=$(dirname "$file") 23.22 - [ -d $fs$dir ] || mkdir -p $fs$dir 23.23 - cp -a $install$file $fs$dir 23.24 - done < $wanted_stuff/$PACKAGE.files-list 23.25 -} 23.26 -
24.1 --- a/libkrb5support/receipt Mon Jun 12 11:40:38 2017 +0300 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,21 +0,0 @@ 24.4 -# SliTaz package receipt. 24.5 - 24.6 -PACKAGE="libkrb5support" 24.7 -VERSION="1.10.3" 24.8 -CATEGORY="security" 24.9 -SHORT_DESC="Kerberos network authentication protocol support libraries." 24.10 -MAINTAINER="pascal.bellard@slitaz.org" 24.11 -LICENSE="MIT" 24.12 -WEB_SITE="http://web.mit.edu/Kerberos/" 24.13 -WANTED="krb5" 24.14 - 24.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 24.16 -genpkg_rules() 24.17 -{ 24.18 - while read file; do 24.19 - dir=$(dirname "$file") 24.20 - [ -d $fs$dir ] || mkdir -p $fs$dir 24.21 - cp -a $install$file $fs$dir 24.22 - done < $wanted_stuff/$PACKAGE.files-list 24.23 -} 24.24 -
25.1 --- a/libsasl-modules/receipt Mon Jun 12 11:40:38 2017 +0300 25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 25.3 @@ -1,23 +0,0 @@ 25.4 -# SliTaz package receipt. 25.5 - 25.6 -PACKAGE="libsasl-modules" 25.7 -VERSION="2.1.23" 25.8 -CATEGORY="system-tools" 25.9 -SHORT_DESC="SASL library modules." 25.10 -MAINTAINER="pascal.bellard@slitaz.org" 25.11 -LICENSE="BSD" 25.12 -PROVIDE="libsasl-without-ldap" 25.13 -WEB_SITE="http://cyrusimap.web.cmu.edu/" 25.14 -WANTED="cyrus-sasl" 25.15 - 25.16 -DEPENDS="libsasl libkrb5 libcomerr3 libcrypto libdb" 25.17 - 25.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 25.19 -genpkg_rules() 25.20 -{ 25.21 - while read file; do 25.22 - dir=${file%/*} 25.23 - [ -d $fs$dir ] || mkdir -p $fs$dir 25.24 - cp -a $install$file $fs$dir 25.25 - done < $wanted_stuff/$PACKAGE.files-list 25.26 -} 25.27 \ No newline at end of file
26.1 --- a/libsasl/receipt Mon Jun 12 11:40:38 2017 +0300 26.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 26.3 @@ -1,26 +0,0 @@ 26.4 -# SliTaz package receipt. 26.5 - 26.6 -PACKAGE="libsasl" 26.7 -VERSION="2.1.23" 26.8 -CATEGORY="system-tools" 26.9 -SHORT_DESC="SASL library." 26.10 -MAINTAINER="pascal.bellard@slitaz.org" 26.11 -LICENSE="BSD" 26.12 -WEB_SITE="http://cyrusimap.web.cmu.edu/" 26.13 -WANTED="cyrus-sasl" 26.14 - 26.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 26.16 -genpkg_rules() 26.17 -{ 26.18 - while read file; do 26.19 - dir=${file%/*} 26.20 - [ -d $fs$dir ] || mkdir -p $fs$dir 26.21 - cp -a $install$file $fs$dir 26.22 - done < $wanted_stuff/$PACKAGE.files-list 26.23 -} 26.24 - 26.25 - 26.26 - 26.27 - 26.28 - 26.29 -