Hello community, here is the log from the commit of package svrcore for openSUSE:Factory checked in at 2017-06-04 01:59:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/svrcore (Old) and /work/SRC/openSUSE:Factory/.svrcore.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "svrcore" Sun Jun 4 01:59:54 2017 rev:11 rq:500453 version:4.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/svrcore/svrcore.changes 2016-12-03 18:26:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.svrcore.new/svrcore.changes 2017-06-04 01:59:55.707358085 +0200 @@ -1,0 +2,11 @@ +Thu Jun 1 16:26:08 UTC 2017 - w...@rosenauer.org + +- updated license string to MPL-2.0 + +------------------------------------------------------------------- +Fri Mar 24 12:55:28 UTC 2017 - mrueck...@suse.de + +- update to 4.1.3 + * Code quality fixes. + +------------------------------------------------------------------- Old: ---- svrcore-4.1.2.tar.bz2 New: ---- svrcore-4.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ svrcore.spec ++++++ --- /var/tmp/diff_new_pack.UoDFSV/_old 2017-06-04 01:59:56.275277924 +0200 +++ /var/tmp/diff_new_pack.UoDFSV/_new 2017-06-04 01:59:56.279277360 +0200 @@ -1,7 +1,7 @@ # # spec file for package svrcore # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2009-2011 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -20,16 +20,18 @@ %bcond_without systemd Name: svrcore %define libpackage libsvrcore0 -Version: 4.1.2 +Version: 4.1.3 Release: 0 Summary: Secure PIN handling using NSS crypto -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ +License: MPL-2.0 Group: Development/Libraries/C and C++ Url: https://pagure.io/svrcore -# http://directory.fedoraproject.org/docs/389ds/development/source.html -Source0: http://directory.fedoraproject.org/binaries/%{name}-%{version}.tar.bz2 +Source0: https://releases.pagure.org/svrcore/svrcore-%{version}.tar.bz2 Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: mozilla-nss-devel BuildRequires: pkgconfig @@ -72,6 +74,7 @@ %setup -q %build +./autogen.sh %if %{with systemd} %configure --with-systemd %else ++++++ svrcore-4.1.2.tar.bz2 -> svrcore-4.1.3.tar.bz2 ++++++ ++++ 41240 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/NEWS new/svrcore-4.1.3/NEWS --- old/svrcore-4.1.2/NEWS 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/NEWS 2017-03-10 20:40:51.000000000 +0100 @@ -1,13 +1,17 @@ -svccore 4.1.2 +svrcore 4.1.3 ============= * Code quality fixes. -svccore 4.1.1 +svrcore 4.1.2 +============= +* Code quality fixes. + +svrcore 4.1.1 ============= * Code quality and stability fixes. * Improvements to rpm tooling and spec file. -svccore 4.1.0 +svrcore 4.1.0 ============= * Add support for systemd-ask-pass integration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/compile new/svrcore-4.1.3/compile --- old/svrcore-4.1.2/compile 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2014 Free Software Foundation, Inc. -# Written by Tom Tromey <tro...@cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-autom...@gnu.org> or send patches to -# <automake-patc...@gnu.org>. - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to <bug-autom...@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/config.h.in new/svrcore-4.1.3/config.h.in --- old/svrcore-4.1.2/config.h.in 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/config.h.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/configure.ac new/svrcore-4.1.3/configure.ac --- old/svrcore-4.1.2/configure.ac 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/configure.ac 2017-03-10 20:40:51.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(svrcore, 4.1.2, [wibr...@redhat.com, rmegg...@redhat.com], svrcore) +AC_INIT(svrcore, 4.1.3, [wibr...@redhat.com, rmegg...@redhat.com], svrcore) AM_INIT_AUTOMAKE([gnu check-news dist-bzip2]) AM_MAINTAINER_MODE AC_CONFIG_SRCDIR([src/svrcore.h]) @@ -16,6 +16,7 @@ AC_CHECK_HEADER([string.h],,[AC_ERROR([We need string.h in order to build])]) AC_CHECK_HEADER([termios.h],,[AC_ERROR([We need termios.h in order to build])]) AC_CHECK_HEADER([unistd.h],,[AC_ERROR([We need unistd.h in order to build])]) +AC_PROG_CC_STDC # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/m4/systemd.m4 new/svrcore-4.1.3/m4/systemd.m4 --- old/svrcore-4.1.2/m4/systemd.m4 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/m4/systemd.m4 2017-03-10 20:40:51.000000000 +0100 @@ -22,7 +22,19 @@ AC_MSG_RESULT(no)) if test "$with_systemd" = yes; then - SYSTEMD_CFLAGS="-DHAVE_SYSTEMD" + AC_MSG_CHECKING(for systemd with pkg-config) + AC_PATH_PROG(PKG_CONFIG, pkg-config) + if test -n "$PKG_CONFIG"; then + if $PKG_CONFIG --exists systemd; then + AC_MSG_CHECKING([systemd found, enabling.]) + SYSTEMD_CFLAGS="-DHAVE_SYSTEMD" + else + AC_MSG_CHECKING([systemd not found, disabling.]) + SYSTEMD_CFLAGS="" + fi + else + AC_MSG_ERROR([pkg-config not found.]) + fi else SYSTEMD_CFLAGS="" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/missing new/svrcore-4.1.3/missing --- old/svrcore-4.1.2/missing 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2013-10-28.13; # UTC - -# Copyright (C) 1996-2014 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to <bug-autom...@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/src/std-systemd.c new/svrcore-4.1.3/src/std-systemd.c --- old/svrcore-4.1.2/src/std-systemd.c 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/src/std-systemd.c 2017-03-10 20:40:51.000000000 +0100 @@ -49,7 +49,6 @@ PRBool systemdPINs, uint64_t timeout) { #ifdef HAVE_SYSTEMD -#ifndef _WIN32 SVRCOREError err = SVRCORE_Success; SVRCOREStdSystemdPinObj *obj = 0; @@ -79,8 +78,8 @@ #endif // During testing, we want to disable this sometimes ... - //SVRCORE_SetUserPinInteractive(obj->user, isatty(fileno(stdin))); - SVRCORE_SetUserPinInteractive(obj->user, PR_FALSE); + // SVRCORE_SetUserPinInteractive(obj->user, PR_FALSE); + SVRCORE_SetUserPinInteractive(obj->user, isatty(fileno(stdin))); top = (SVRCOREPinObj*)obj->user; @@ -147,7 +146,6 @@ } return err; -#endif // win32 #else // systemd return SVRCORE_MissingFeature; #endif // Systemd @@ -158,7 +156,6 @@ SVRCOREStdSystemdPinObj *obj) { #ifdef HAVE_SYSTEMD -#ifndef _WIN32 if (!obj) return; if (obj->user) SVRCORE_DestroyUserPinObj(obj->user); @@ -169,7 +166,6 @@ if (obj->systemdalt) SVRCORE_DestroyAltPinObj(obj->systemdalt); free(obj); -#endif // win32 #endif // Systemd } @@ -179,9 +175,7 @@ SVRCORE_SetStdSystemdPinInteractive(SVRCOREStdSystemdPinObj *obj, PRBool i) { #ifdef HAVE_SYSTEMD -#ifndef _WIN32 SVRCORE_SetUserPinInteractive(obj->user, i); -#endif // win32 #endif // Systemd } @@ -194,7 +188,6 @@ const char *tokenName) { #ifdef HAVE_SYSTEMD -#ifndef _WIN32 #ifdef DEBUG printf("std-systemd:stdsystem-getpin() -> starting \n"); #endif @@ -206,7 +199,6 @@ } return SVRCORE_CachedPinGetPin(pin, obj->cache, tokenName); -#endif // win32 #else // systemd return SVRCORE_MissingFeature; #endif // Systemd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/src/systemd-ask-pass.c new/svrcore-4.1.3/src/systemd-ask-pass.c --- old/svrcore-4.1.2/src/systemd-ask-pass.c 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/src/systemd-ask-pass.c 2017-03-10 20:40:51.000000000 +0100 @@ -50,7 +50,6 @@ SVRCORE_CreateSystemdPinObj(SVRCORESystemdPinObj **out, uint64_t timeout) { #ifdef HAVE_SYSTEMD -#ifndef _WIN32 SVRCOREError err = SVRCORE_Success; SVRCORESystemdPinObj *obj = NULL; @@ -79,12 +78,12 @@ *out = obj; return err; -#endif // win32 #else // systemd return SVRCORE_MissingFeature; #endif // Systemd } +#ifdef HAVE_SYSTEMD SVRCOREError _create_socket(char **path, int *sfd) { @@ -158,12 +157,12 @@ out: return err; } +#endif // Systemd static char * getPin(SVRCOREPinObj *obj, const char *tokenName, PRBool retry) { #ifdef HAVE_SYSTEMD -#ifndef _WIN32 SVRCORESystemdPinObj *sobj = (SVRCORESystemdPinObj *)obj; SVRCOREError err = SVRCORE_Success; char *tbuf = malloc(PASS_MAX); @@ -443,7 +442,6 @@ return token; -#endif // win32 #else // systemd return NULL; #endif // Systemd @@ -453,11 +451,9 @@ SVRCORE_DestroySystemdPinObj(SVRCORESystemdPinObj *obj) { #ifdef HAVE_SYSTEMD -#ifndef _WIN32 if (obj) { free(obj); } -#endif // win32 #endif // Systemd } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/svrcore-4.1.2/svrcore.spec new/svrcore-4.1.3/svrcore.spec --- old/svrcore-4.1.2/svrcore.spec 2016-04-21 22:30:23.000000000 +0200 +++ new/svrcore-4.1.3/svrcore.spec 2017-03-10 20:40:51.000000000 +0100 @@ -14,6 +14,11 @@ BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} BuildRequires: pkgconfig +BuildRequires: pkgconfig(systemd) +# Needed to support regeneration of the autotool artifacts. +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool Source0: http://www.port389.org/binaries/%{name}-%{version}.tar.bz2 @@ -46,6 +51,7 @@ %build +autoreconf -fiv %configure --with-systemd make @@ -74,6 +80,13 @@ %{_includedir}/svrcore.h %changelog +* Fri Mar 10 2017 Mark Reynolds <mreyno...@redhat.com> - 4.1.3 +- Bump version to 4.1.3 +- Ticket 18 - Remove configure outputs +- Ticket 17 - update stdc to c99 to match other projects +- Ticket 16 - with systemd should unset have systemd if pkgconfig not found +- Ticket 14 - svrcore does not detect tty + * Thu Apr 21 2016 Noriko Hosoi <nho...@redhat.com> - 4.1.2 - Code quality improvements
