!1 cyrus-sasl: simplify functions

Merge pull request !1 from guoxiaoqi/next

autogen.sh

@@ -1,37 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-
-cd $srcdir
-
-(test -f configure.ac) || {
-	echo "*** ERROR: Directory "\`$srcdir\'" does not look like the top-level project directory ***"
-	exit 1
-}
-
-PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac`
-
-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
-	echo "*** WARNING: I am going to run \`configure' with no arguments." >&2
-	echo "*** If you wish to pass any to it, please specify them on the" >&2
-	echo "*** \`$0\' command line." >&2
-	echo "" >&2
-fi
-
-aclocal --install || exit 1
-autoreconf --verbose --force --install -Wno-portability || exit 1
-
-cd $olddir
-if [ "$NOCONFIGURE" = "" ]; then
-	$srcdir/configure "$@" || exit 1
-
-	if [ "$1" = "--help" ]; then exit 0 else
-		echo "Now type \`make\' to compile $PKG_NAME" || exit 1
-	fi
-else
-	echo "Skipping configure process."
-fi
-

cyrus-sasl-2.1.20-saslauthd.conf-path.patch

@@ -1,26 +0,0 @@
-diff -up cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc.path cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc
---- cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc.path	2015-10-15 15:44:43.000000000 +0200
-+++ cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc	2015-11-20 15:05:30.421377527 +0100
-@@ -221,7 +221,7 @@ instead.
- .Em (All platforms that support OpenLDAP 2.0 or higher)
- .Pp
- Authenticate against an ldap server.  The ldap configuration parameters are
--read from /usr/local/etc/saslauthd.conf.  The location of this file can be
-+read from /etc/saslauthd.conf.  The location of this file can be
- changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
- distribution for the list of available parameters.
- .It Li sia
-@@ -251,10 +251,10 @@ these ticket files can cause serious per
- servers. (Kerberos
- was never intended to be used in this manner, anyway.)
- .Sh FILES
--.Bl -tag -width "/var/run/saslauthd/mux"
--.It Pa /var/run/saslauthd/mux
-+.Bl -tag -width "/run/saslauthd/mux"
-+.It Pa /run/saslauthd/mux
- The default communications socket.
--.It Pa /usr/local/etc/saslauthd.conf
-+.It Pa /etc/saslauthd.conf
- The default configuration file for ldap support.
- .El
- .Sh SEE ALSO

cyrus-sasl-2.1.21-sizes.patch

@@ -1,119 +0,0 @@
-diff -up cyrus-sasl-2.1.27/configure.ac.sizes cyrus-sasl-2.1.27/configure.ac
---- cyrus-sasl-2.1.27/configure.ac.sizes	2015-11-18 09:46:24.000000000 +0100
-+++ cyrus-sasl-2.1.27/configure.ac	2015-11-20 15:11:20.474588247 +0100
-@@ -1312,6 +1312,10 @@ AC_HEADER_STDC
- AC_HEADER_DIRENT
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
-+AC_CHECK_TYPES([long long, int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],,,[
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif])
- 
- IPv6_CHECK_SS_FAMILY()
- IPv6_CHECK_SA_LEN()
-diff -up cyrus-sasl-2.1.27/include/makemd5.c.sizes cyrus-sasl-2.1.27/include/makemd5.c
---- cyrus-sasl-2.1.27/include/makemd5.c.sizes	2015-10-15 15:44:43.000000000 +0200
-+++ cyrus-sasl-2.1.27/include/makemd5.c	2015-11-20 15:11:20.477588240 +0100
-@@ -82,12 +82,19 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+#include "../config.h"
-+#endif
- 
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-+
- 
- static void
- my_strupr(char *s)
-@@ -122,6 +129,18 @@ my_strupr(char *s)
- static void
- try_signed(FILE *f, int len)
- {
-+#ifdef HAVE_INT8_T
-+    BITSIZE(int8_t);
-+#endif
-+#ifdef HAVE_INT16_T
-+    BITSIZE(int16_t);
-+#endif
-+#ifdef HAVE_INT32_T
-+    BITSIZE(int32_t);
-+#endif
-+#ifdef HAVE_INT64_T
-+    BITSIZE(int64_t);
-+#endif
-     BITSIZE(signed char);
-     BITSIZE(short);
-     BITSIZE(int);
-@@ -135,6 +154,18 @@ try_signed(FILE *f, int len)
- static void
- try_unsigned(FILE *f, int len)
- {
-+#ifdef HAVE_UINT8_T
-+    BITSIZE(uint8_t);
-+#endif
-+#ifdef HAVE_UINT16_T
-+    BITSIZE(uint16_t);
-+#endif
-+#ifdef HAVE_UINT32_T
-+    BITSIZE(uint32_t);
-+#endif
-+#ifdef HAVE_UINT64_T
-+    BITSIZE(uint64_t);
-+#endif
-     BITSIZE(unsigned char);
-     BITSIZE(unsigned short);
-     BITSIZE(unsigned int);
-@@ -165,6 +196,11 @@ static int print_pre(FILE *f)
- 	  "/* POINTER defines a generic pointer type */\n"
- 	  "typedef unsigned char *POINTER;\n"
- 	  "\n"
-+#ifdef HAVE_INTTYPES_H
-+	  "/* We try to define integer types for our use */\n"
-+	  "#include <inttypes.h>\n"
-+	  "\n"
-+#endif
- 	  );
-   return 1;
- }
-@@ -212,31 +248,15 @@ int main(int argc, char **argv)
- 
-   print_pre(f);
- 
--#ifndef HAVE_INT8_T
-     try_signed (f, 8);
--#endif /* HAVE_INT8_T */
--#ifndef HAVE_INT16_T
-     try_signed (f, 16);
--#endif /* HAVE_INT16_T */
--#ifndef HAVE_INT32_T
-     try_signed (f, 32);
--#endif /* HAVE_INT32_T */
--#ifndef HAVE_INT64_T
-     try_signed (f, 64);
--#endif /* HAVE_INT64_T */
- 
--#ifndef HAVE_U_INT8_T
-     try_unsigned (f, 8);
--#endif /* HAVE_INT8_T */
--#ifndef HAVE_U_INT16_T
-     try_unsigned (f, 16);
--#endif /* HAVE_U_INT16_T */
--#ifndef HAVE_U_INT32_T
-     try_unsigned (f, 32);
--#endif /* HAVE_U_INT32_T */
--#ifndef HAVE_U_INT64_T
-     try_unsigned (f, 64);
--#endif /* HAVE_U_INT64_T */
- 
-     print_post(f);
-   

cyrus-sasl-2.1.23-man.patch

@@ -1,24 +0,0 @@
-diff -up cyrus-sasl-2.1.26/saslauthd/testsaslauthd.8.man cyrus-sasl-2.1.26/saslauthd/testsaslauthd.8
---- cyrus-sasl-2.1.26/saslauthd/testsaslauthd.8.man	2013-09-03 15:25:26.818042047 +0200
-+++ cyrus-sasl-2.1.26/saslauthd/testsaslauthd.8	2013-09-03 15:25:26.818042047 +0200
-@@ -0,0 +1,20 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.TH TESTSASLAUTHD 8 "14 October 2006"
-+.SH NAME
-+testsaslauthd \- test utility for the SASL authentication server
-+.SH SYNOPSIS
-+.B testsaslauthd
-+.RI "[ " \(hyr " " realm " ] [ " \(hys " " servicename " ] [ " \(hyf " " socket " " path " ] [ " \(hyR " " repeatnum " ]"
-+.SH DESCRIPTION
-+This manual page documents briefly the
-+.B testsaslauthd
-+command.
-+.PP
-+.SH SEE ALSO
-+.BR saslauthd (8).
-+.br
-+.SH AUTHOR
-+testsaslauthd was written by Carnegie Mellon University.
-+.PP
-+This manual page was written by Roberto C. Sanchez <roberto@connexer.com>,
-+for the Debian project (but may be used by others).

cyrus-sasl-2.1.25-no_rpath.patch

@@ -1,20 +0,0 @@
-diff -up cyrus-sasl-2.1.25/m4/cyrus.m4.no_rpath cyrus-sasl-2.1.25/m4/cyrus.m4
---- cyrus-sasl-2.1.25/m4/cyrus.m4.no_rpath	2010-01-22 16:12:01.000000000 +0100
-+++ cyrus-sasl-2.1.25/m4/cyrus.m4	2012-12-06 14:59:47.956102057 +0100
-@@ -32,14 +32,5 @@ AC_DEFUN([CMU_ADD_LIBPATH_TO], [
- dnl runpath initialization
- AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
-    # CMU GUESS RUNPATH SWITCH
--  AC_CACHE_CHECK(for runpath switch, andrew_cv_runpath_switch, [
--    # first, try -R
--    SAVE_LDFLAGS="${LDFLAGS}"
--    LDFLAGS="-R /usr/lib"
--    AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [
--  	LDFLAGS="-Wl,-rpath,/usr/lib"
--    AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-Wl,-rpath,"],
--    [andrew_cv_runpath_switch="none"])
--    ])
--  LDFLAGS="${SAVE_LDFLAGS}"
--  ])])
-+    andrew_runpath_switch="none"
-+  ])

cyrus-sasl-2.1.26-md5global.patch

@@ -1,24 +0,0 @@
-diff -up cyrus-sasl-2.1.27/include/Makefile.am.md5global.h cyrus-sasl-2.1.27/include/Makefile.am
---- cyrus-sasl-2.1.27/include/Makefile.am.md5global.h	2018-05-17 13:33:49.588368350 +0200
-+++ cyrus-sasl-2.1.27/include/Makefile.am	2018-05-17 13:38:19.377316869 +0200
-@@ -49,20 +49,7 @@ saslinclude_HEADERS = hmac-md5.h md5.h m
- 
- noinst_PROGRAMS = makemd5
- 
--makemd5_SOURCES = makemd5.c
--
--makemd5$(BUILD_EXEEXT) $(makemd5_OBJECTS): CC=$(CC_FOR_BUILD)
--makemd5$(BUILD_EXEEXT) $(makemd5_OBJECTS): CFLAGS=$(CFLAGS_FOR_BUILD)
--makemd5$(BUILD_EXEEXT): LDFLAGS=$(LDFLAGS_FOR_BUILD)
--
--md5global.h: makemd5$(BUILD_EXEEXT) Makefile
--	-rm -f $@
--	./$< $@
--
--BUILT_SOURCES = md5global.h
--
- EXTRA_DIST = NTMakefile
--DISTCLEANFILES = md5global.h
- 
- if MACOSX
- framedir = /Library/Frameworks/SASL2.framework

cyrus-sasl.spec

@@ -6,23 +6,14 @@
 
 Name: cyrus-sasl
 Version: 2.1.27
-Release: 6
+Release: 7
 Summary: The Cyrus SASL API Implementation
 
 License: BSD with advertising
 URL: https://www.cyrusimap.org/sasl/
-Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz
+Source0: https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
-Source5: saslauthd.service
+Source1: saslauthd.service
-Source7: sasl-mechlist.c
-Source9: saslauthd.sysconfig
-Source10: make-no-dlcompatorsrp-tarball.sh
-Source11: autogen.sh
 
-Patch11: cyrus-sasl-2.1.25-no_rpath.patch
-Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
-Patch23: cyrus-sasl-2.1.23-man.patch
-Patch24: cyrus-sasl-2.1.21-sizes.patch
-Patch49: cyrus-sasl-2.1.26-md5global.patch
 Patch6000: 0003-Prevent-double-free-of-RC4-context.patch
 
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -90,10 +81,10 @@ using a RDBMS for storing shared secrets.
 %autosetup -n %{name}-%{version} -p1
 
 %build
-cp %{SOURCE11} ./
 rm configure aclocal.m4 config/ltmain.sh Makefile.in
 export NOCONFIGURE=yes
-sh autogen.sh
+aclocal --install
+autoreconf --verbose --force --install -Wno-portability
  
 krb5_prefix=`krb5-config --prefix`
 if test x$krb5_prefix = x%{_prefix} ; then
@@ -168,9 +159,6 @@ make sasldir=%{_libdir}/sasl2
 make -C saslauthd testsaslauthd
 make -C sample
  
-pushd lib
-../libtool --mode=link %{__cc} -o sasl2-shared-mechlist -I../include $CFLAGS %{SOURCE7} $LDFLAGS ./libsasl2.la
- 
 
 %install
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
@@ -187,16 +175,11 @@ install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-server
 install -m755 saslauthd/testsaslauthd $RPM_BUILD_ROOT%{_sbindir}/testsaslauthd
 install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/
 install -m644 -p saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
-install -m644 -p saslauthd/testsaslauthd.8 $RPM_BUILD_ROOT%{_mandir}/man8/testsaslauthd.8
 install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} $RPM_BUILD_ROOT/etc/sysconfig
-install -m644 -p %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service
+install -m644 -p %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service
-install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
 install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
 install -m755 -d $RPM_BUILD_ROOT/%{_libdir}/sasl2
  
-./libtool --mode=install \
-install -m755 lib/sasl2-shared-mechlist $RPM_BUILD_ROOT/%{_sbindir}/
- 
 rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.*
 rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8
 %delete_la_and_a
@@ -221,14 +204,12 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir}
 %defattr(-,root,root)
 %license COPYING
 %doc AUTHORS
-%config(noreplace) /etc/sysconfig/saslauthd
 %dir %{_sysconfdir}/sasl2
 %{_sbindir}/pluginviewer
 %{_sbindir}/saslauthd
 %{_sbindir}/testsaslauthd
 %{_sbindir}/saslpasswd2
 %{_sbindir}/sasldblistusers2
-%{_sbindir}/sasl2-shared-mechlist
 %{_libdir}/libsasl*.so.*
 %dir %{_libdir}/sasl2/
 %{_libdir}/sasl2/*anonymous*.so*
@@ -267,6 +248,9 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir}
 
 
 %changelog
+* Tue Jan 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.1.27-7
+- simplify functions
+
 * Mon Dec 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.1.27-6
 - Fix update problem
 

make-no-dlcompatorsrp-tarball.sh

@@ -1,41 +0,0 @@
-#!/bin/bash -e
-#
-#  See ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ for unmodified sources.
-#
-
-tmppath=`mktemp -d ${TMPDIR:-/tmp}/make-no-dlcompat-tarball-XXXXXX`
-if test -z "$tmppath" ; then
-	echo Error creating temporary directory.
-	exit 1
-fi
-trap "rm -fr $tmppath" EXIT
-
-initialdir=`pwd`
-
-for tarball in ${initialdir}/cyrus-sasl-*.tar.{gz,bz2} ; do
-	if ! test -s "$tarball" ; then
-		continue
-	fi
-	rm -fr $tmppath/*
-	pushd $tmppath > /dev/null
-	case "$tarball" in
-	*nodlcompat*)
-		: Do nothing.
-		;;
-	*.gz)
-		gzip  -dc "$tarball" | tar xf -
-		rm -fr cyrus-sasl-*/dlcompat*
-		rm -fr cyrus-sasl-*/plugins/srp*
-		tar cf - * | gzip  -9c > \
-		$initialdir/`basename $tarball .tar.gz`-nodlcompatorsrp.tar.gz
-		;;
-	*.bz2)
-		bzip2 -dc "$tarball" | tar xf -
-		rm -fr cyrus-sasl-*/dlcompat*
-		rm -fr cyrus-sasl-*/plugins/srp*
-		tar cf - * | bzip2 -9c > \
-		$initialdir/`basename $tarball .tar.bz2`-nodlcompatorsrp.tar.bz2
-		;;
-	esac
-	popd > /dev/null
-done

sasl-mechlist.c

@@ -1,99 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "sasl.h"
-
-static int
-my_getopt(void *context, const char *plugin_name,
-	  const char *option, const char **result, unsigned *len)
-{
-	if (result) {
-		*result = NULL;
-#if 0
-		fprintf(stderr, "Getopt plugin=%s%s%s/option=%s%s%s -> ",
-			plugin_name ? "\"" : "",
-			plugin_name ? plugin_name : "(null)",
-			plugin_name ? "\"" : "",
-			option ? "\"" : "",
-			option ? option : "(null)",
-			option ? "\"" : "");
-		fprintf(stderr, "'%s'.\n", *result ? *result : "");
-#endif
-	}
-	if (len) {
-		*len = 0;
-	}
-	return 0;
-}
-
-int
-main(int argc, char **argv)
-{
-	int ret, i;
-	const char *mechs, **globals;
-	sasl_callback_t callbacks[] = {
-		{SASL_CB_GETOPT, my_getopt, NULL},
-		{SASL_CB_LIST_END},
-	};
-	sasl_conn_t *connection;
-	char hostname[512];
-
-	if ((argc > 1) && (argv[1][0] == '-')) {
-		fprintf(stderr, "Usage: %s [appname [hostname] ]\n", argv[0]);
-		return 0;
-	}
-
-	ret = sasl_server_init(callbacks, argc > 1 ? argv[1] : "sasl-mechlist");
-	if (ret != SASL_OK) {
-		fprintf(stderr, "Error in sasl_server_init(): %s\n",
-			sasl_errstring(ret, NULL, NULL));
-	}
-
-	connection = NULL;
-	strcpy(hostname, "localhost");
-	gethostname(hostname, sizeof(hostname));
-	ret = sasl_server_new(argc > 2 ? argv[2] : "host",
-			      hostname,
-			      NULL,
-			      NULL,
-			      NULL,
-			      callbacks,
-			      0,
-			      &connection);
-	if (ret != SASL_OK) {
-		fprintf(stderr, "Error in sasl_server_new(): %s\n",
-			sasl_errstring(ret, NULL, NULL));
-	}
-
-	ret = sasl_listmech(connection,
-			    getenv("USER") ? getenv("USER") : "root",
-			    "Available mechanisms: ",
-			    ",",
-			    "\n",
-			    &mechs,
-			    NULL,
-			    NULL);
-	if (ret != SASL_OK) {
-		fprintf(stderr, "Error in sasl_listmechs(): %s\n",
-			sasl_errstring(ret, NULL, NULL));
-	} else {
-		fprintf(stdout, "%s", mechs);
-	}
-
-	globals = sasl_global_listmech();
-	for (i = 0; (globals != NULL) && (globals[i] != NULL); i++) {
-		if (i == 0) {
-			fprintf(stdout, "Library supports: ");
-		}
-		fprintf(stdout, "%s", globals[i]);
-		if (globals[i + 1] != NULL) {
-			fprintf(stdout, ",");
-		} else {
-			fprintf(stdout, "\n");
-		}
-	}
-
-	return 0;
-}

saslauthd.service

@@ -3,9 +3,8 @@ Description=SASL authentication daemon.
 
 [Service]
 Type=forking
-PIDFile=/run/saslauthd/saslauthd.pid
 EnvironmentFile=/etc/sysconfig/saslauthd
-ExecStart=/usr/sbin/saslauthd -m $SOCKETDIR -a $MECH $FLAGS
+ExecStart=/usr/sbin/saslauthd -m /run/saslauthd -a pam
 RuntimeDirectory=saslauthd
 
 [Install]

saslauthd.sysconfig

@@ -1,11 +0,0 @@
-# Directory in which to place saslauthd's listening socket, pid file, and so
-# on.  This directory must already exist.
-SOCKETDIR=/run/saslauthd
-
-# Mechanism to use when checking passwords.  Run "saslauthd -v" to get a list
-# of which mechanism your installation was compiled with the ablity to use.
-MECH=pam
-
-# Additional flags to pass to saslauthd on the command line.  See saslauthd(8)
-# for the list of accepted flags.
-FLAGS=