Mailinglist Archive: opensuse-commit (710 mails)
| < Previous | Next > |
commit sendmail for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 03 May 2010 21:33:11 +0200
- Message-id: <20100503193311.1601B202B9@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package sendmail for openSUSE:Factory
checked in at Mon May 3 21:33:10 CEST 2010.
--------
--- sendmail/uucp.changes 2009-12-18 00:42:58.000000000 +0100
+++ sendmail/uucp.changes 2010-03-09 17:03:48.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Mar 9 16:03:15 UTC 2010 - lnussel@xxxxxxx
+
+- use lockdev (FATE#308360)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
uucp-1.07-lockdev.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sendmail.spec ++++++
--- /var/tmp/diff_new_pack.0l26Zv/_old 2010-05-03 21:32:21.000000000 +0200
+++ /var/tmp/diff_new_pack.0l26Zv/_new 2010-05-03 21:32:21.000000000 +0200
@@ -37,7 +37,7 @@
Obsoletes: sendmail-tls
AutoReqProv: on
Version: 8.14.4
-Release: 1
+Release: 2
Summary: BSD Sendmail
Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail-%{version}.tar.bz2
Source1: FAQ.sendmail-8.14.bz2
@@ -87,7 +87,7 @@
%package -n rmail
Version: 8.14.3
-Release: 51
+Release: 52
Summary: Rmail of the BSD Sendmail
License: PERMISSIVE-OSI-COMPLIANT
Group: Productivity/Networking/Email/Servers
++++++ uucp.spec ++++++
--- /var/tmp/diff_new_pack.0l26Zv/_old 2010-05-03 21:32:21.000000000 +0200
+++ /var/tmp/diff_new_pack.0l26Zv/_new 2010-05-03 21:32:21.000000000 +0200
@@ -26,7 +26,7 @@
Recommends: stunnel
AutoReqProv: on
Version: 1.07
-Release: 426
+Release: 427
Summary: Taylor UUCP
Source0: uucp-1.07.tar.bz2
Source1: uucpcfg.tar.bz2
@@ -37,7 +37,9 @@
Patch1: uucp-1.07-contrib.dif
Patch2: uucp-1.07-grade.patch
Patch3: uucp-1.07-cu.patch
+Patch4: uucp-1.07-lockdev.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: lockdev-devel pkg-config
%description
Ian Taylor's Unix to Unix copy: mail and news over modem lines. This is
@@ -63,6 +65,7 @@
%patch -P 1 -b .cont
%patch -P 2 -p0 -b .grad
%patch -P 3 -p0 -b .cu
+%patch -P 4 -p0 -b .lockdev
%patch -P 0
%build
@@ -71,9 +74,7 @@
RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
#
%{?suse_update_config:%{suse_update_config -f}}
- aclocal
- automake
- autoconf
+ autoreconf
CFLAGS="-Wall ${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE" \
./configure \
--with-newconfigdir=/etc/uucp \
++++++ uucp-1.07-lockdev.patch ++++++
Index: unix/serial.c
===================================================================
--- unix/serial.c.orig
+++ unix/serial.c
@@ -126,6 +126,10 @@ const char serial_rcsid[] = "$Id: serial
#include <sys/termiox.h>
#endif
+#if HAVE_LOCKDEV
+#include <ttylock.h>
+#endif
+
/* Get definitions for both O_NONBLOCK and O_NDELAY. */
#ifndef O_NDELAY
#ifdef FNDELAY
@@ -623,6 +627,18 @@ fsserial_lockfile (flok, qconn)
z = zalc;
}
#else /* ! HAVE_QNX_LOCKFILES */
+#if HAVE_LOCKDEV
+ {
+ int rc;
+
+ if (flok)
+ rc = ttylock(qsysdep->zdevice);
+ else
+ rc = ttyunlock(qsysdep->zdevice);
+ fret = (rc == 0 ? TRUE : FALSE);
+ return fret;
+ }
+#else /* ! HAVE_LOCKDEV */
#if ! HAVE_SVR4_LOCKFILES
{
const char *zbase;
@@ -660,6 +676,7 @@ fsserial_lockfile (flok, qconn)
z = zalc;
}
#endif /* HAVE_SVR4_LOCKFILES */
+#endif /* ! HAVE_LOCKDEV */
#endif /* ! HAVE_QNX_LOCKFILES */
}
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -25,7 +25,7 @@ endif
AM_CFLAGS = $(WARN_CFLAGS) $(UUDIRFLAGS)
-LDADD = unix/libunix.a uuconf/libuuconf.a lib/libuucp.a
+LDADD = unix/libunix.a uuconf/libuuconf.a lib/libuucp.a $(LOCKDEV_LIBS)
UUHEADERS = uucp.h uudefs.h uuconf.h policy.h system.h sysdep.h getopt.h
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -787,4 +787,6 @@ else
AC_SYS_LONG_FILE_NAMES
fi
dnl
+PKG_CHECK_MODULES([LOCKDEV], [lockdev], AC_DEFINE([HAVE_LOCKDEV],[1],[Define
if you have lockdev]))
+dnl
AC_OUTPUT(Makefile uuconf/Makefile lib/Makefile unix/Makefile)
++++++ uucp-1.07.dif ++++++
--- /var/tmp/diff_new_pack.0l26Zv/_old 2010-05-03 21:32:22.000000000 +0200
+++ /var/tmp/diff_new_pack.0l26Zv/_new 2010-05-03 21:32:22.000000000 +0200
@@ -1,11 +1,11 @@
--- .pkgextract
-+++ .pkgextract 2006-06-22 12:58:24.000000000 +0200
++++ .pkgextract 2006-06-22 10:58:24.000000000 +0000
@@ -0,0 +1,3 @@
+patch -p0 -s --suffix=.cont < ../uucp-1.07-contrib.dif
+patch -p0 -s --suffix=.grad < ../uucp-1.07-grade.patch
+patch -p0 -s --suffix=.cu < ../uucp-1.07-cu.patch
--- Makefile.am
-+++ Makefile.am 2007-02-12 15:59:24.000000000 +0100
++++ Makefile.am 2007-02-12 14:59:24.000000000 +0000
@@ -75,20 +75,24 @@ EXTRA_DIST = uusched.in uuto.in \
dist-hook:
@@ -36,7 +36,7 @@
chmod 4555 $(DESTDIR)$(uudirdir)/uudir
endif
--- README.suse
-+++ README.suse 2006-06-22 12:58:24.000000000 +0200
++++ README.suse 2006-06-22 10:58:24.000000000 +0000
@@ -0,0 +1,9 @@
+If you want to have a public uucp directory, use the "pubdir" command
+in the sys file and change the permissions of this directory with:
@@ -48,8 +48,8 @@
+uucp.uucp 1777.
+
--- configure.in
-+++ configure.in 2006-06-22 12:58:24.000000000 +0200
-@@ -15,6 +15,13 @@
++++ configure.in 2006-06-22 10:58:24.000000000 +0000
+@@ -15,6 +15,13 @@ AC_ARG_WITH(user,
AC_DEFINE_UNQUOTED(OWNER, "$OWNER", [user ID for programs; normally uucp])
AC_SUBST(OWNER)
dnl
@@ -63,7 +63,7 @@
AC_ARG_WITH(newconfigdir,
[ --with-newconfigdir=DIRNAME new config file directory; default
PREFIX/conf/uucp],
[NEWCONFIGDIR=${withval}],
-@@ -57,10 +64,10 @@
+@@ -57,10 +64,10 @@ dnl Adding it here allows the environmen
dnl be cached in config.status and in the Makefiles.
AR=${AR-ar}
AC_SUBST(AR)
@@ -75,7 +75,7 @@
AC_CHECK_LIB(sun, getpwnam)
AC_C_CONST
AC_MSG_CHECKING([for prototypes])
-@@ -361,8 +368,8 @@
+@@ -361,8 +368,8 @@ dnl getdelim.
AC_CHECK_FUNC(getdelim,
[AC_CHECK_FUNC(getline,
[AC_DEFINE(HAVE_GETLINE, 1, [Define if you have the getline function.])],
@@ -86,7 +86,7 @@
dnl
dnl Check for the SCO buggy ftime; the code can cope with the bug,
dnl though it would prefer not to, so if we're cross-configuring we
-@@ -465,52 +472,52 @@
+@@ -465,52 +472,52 @@ fi
dnl
dnl Figure out which functions we need from lib subdirectory
if test $ac_cv_func_bsearch != yes; then
@@ -153,7 +153,7 @@
dnl Figure out which functions we need from unix subdirectory
if test $ac_cv_func_opendir != yes; then
UNIXOBJS="$UNIXOBJS dirent.o"
-@@ -715,7 +722,7 @@
+@@ -715,7 +722,7 @@ if test $space = no; then
fi
dnl See whether we can make an extern declaration
@@ -163,7 +163,7 @@
AC_CACHE_VAL(uucp_cv_decl_$1,
[AC_TRY_COMPILE([#include <sys/types.h>
--- cu.1
-+++ cu.1 2006-06-22 12:58:24.000000000 +0200
++++ cu.1 2006-06-22 10:58:24.000000000 +0000
@@ -1,4 +1,6 @@
-''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
+'\"
@@ -173,7 +173,7 @@
.SH NAME
cu \- Call up another system
--- logrotate
-+++ logrotate 2006-06-22 12:58:24.000000000 +0200
++++ logrotate 2006-06-22 10:58:24.000000000 +0000
@@ -0,0 +1,23 @@
+/var/log/uucp/Log /var/log/uucp/Stats {
+ compress
@@ -199,7 +199,7 @@
+ copytruncate
+}
--- policy.h
-+++ policy.h 2006-06-22 12:58:24.000000000 +0200
++++ policy.h 2006-06-22 10:58:24.000000000 +0000
@@ -22,6 +22,15 @@
The author of the program may be contacted at ian@xxxxxxxxx
*/
@@ -262,15 +262,6 @@
/* #define LOCKDIR "/etc/locks" */
/* #define LOCKDIR "/usr/spool/locks" */
/* #define LOCKDIR "/usr/spool/uucp/LCK" */
-@@ -349,7 +360,7 @@
- The format for QNX lock files was made up just for Taylor UUCP.
- QNX doesn't come with a version of UUCP. */
- #define HAVE_V2_LOCKFILES 0
--#define HAVE_HDB_LOCKFILES 0
-+#define HAVE_HDB_LOCKFILES 1
- #define HAVE_SCO_LOCKFILES 0
- #define HAVE_SVR4_LOCKFILES 0
- #define HAVE_SEQUENT_LOCKFILES 0
@@ -420,7 +431,7 @@
the executable. Leaving them out will decrease the executable
size. Leaving them in will make it easier to determine which
@@ -402,7 +393,7 @@
#endif /* HAVE_HDB_LOGGING */
--- uuchk.1
-+++ uuchk.1 2006-06-22 15:33:29.000000000 +0200
++++ uuchk.1 2006-06-22 13:33:29.000000000 +0000
@@ -0,0 +1,39 @@
+.TH uuchk 1 "Taylor UUCP 1.07"
+.\" manual page source format generated by PolyglotMan v3.0.8+X.Org,
@@ -444,7 +435,7 @@
+.B info uucp 'Invoking uuchk'
+.RE
--- uucico.8
-+++ uucico.8 2006-06-22 12:58:24.000000000 +0200
++++ uucico.8 2006-06-22 10:58:24.000000000 +0000
@@ -1,4 +1,6 @@
-''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
+'\"
@@ -454,8 +445,8 @@
.SH NAME
uucico \- UUCP file transfer daemon
--- uucico.c
-+++ uucico.c 2006-06-22 12:58:24.000000000 +0200
-@@ -981,6 +981,9 @@
++++ uucico.c 2006-06-22 10:58:24.000000000 +0000
+@@ -981,6 +981,9 @@ fcall (puuconf, zconfig, fuuxqt, qorigsy
continue;
}
@@ -466,7 +457,7 @@
/* Make sure this is a legal time to call. */
--- uuconv.1
-+++ uuconv.1 2006-06-22 16:03:11.000000000 +0200
++++ uuconv.1 2006-06-22 14:03:11.000000000 +0000
@@ -0,0 +1,74 @@
+.TH uuconv 1 "Taylor UUCP 1.07"
+.\" manual page source format generated by PolyglotMan v3.0.8+X.Org,
@@ -543,7 +534,7 @@
+.B info uucp 'Invoking uuconv'
+.RE
--- uucp.1
-+++ uucp.1 2006-06-22 12:58:25.000000000 +0200
++++ uucp.1 2006-06-22 10:58:25.000000000 +0000
@@ -1,4 +1,6 @@
-''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
+'\"
@@ -553,8 +544,8 @@
.SH NAME
uucp \- Unix to Unix copy
--- uucp.texi
-+++ uucp.texi 2006-06-22 12:58:25.000000000 +0200
-@@ -2289,8 +2289,8 @@
++++ uucp.texi 2006-06-22 10:58:25.000000000 +0000
+@@ -2289,8 +2289,8 @@ system switch (e.g., @samp{uucico -s uun
you what happens. The exact location of the log file depends upon the
settings in @file{policy.h} when you compiled the program, and on the
use of the @code{logfile} command in the @file{config} file. Typical
@@ -565,7 +556,7 @@
If you compiled the code with debugging enabled, you can use debugging
mode to get a great deal of information about what sort of data is
-@@ -2304,7 +2304,7 @@
+@@ -2304,7 +2304,7 @@ last example. Use @samp{-x all} to turn
information.
The debugging information is written to a file, normally
@@ -574,7 +565,7 @@
@file{policy.h}, and the @file{config} file can override the default
with the @code{debugfile} command. The debugging file may contain
passwords and some file contents as they are transmitted over the line,
-@@ -2314,7 +2314,7 @@
+@@ -2314,7 +2314,7 @@ You can use the @option{-f} switch to fo
even if the last call failed recently; using @option{-S} when naming a
system has the same effect. Otherwise the status file (in the
@file{.Status} subdirectory of the main spool directory, normally
@@ -583,7 +574,7 @@
attempts from occurring in rapid succession.
On older System V based systems which do not have the @code{setreuid}
-@@ -2421,7 +2421,7 @@
+@@ -2421,7 +2421,7 @@ be set to @command{uucico}.
Here is a sample @file{/etc/passwd} line to accept calls from a remote
system named airs:
@example
@@ -592,7 +583,7 @@
@end example
The details may vary on your system. You must use reasonable user and
group ID's. You must use the correct file name for @command{uucico}.
-@@ -2827,7 +2827,7 @@
+@@ -2827,7 +2827,7 @@ You should periodically trim the UUCP lo
grow without limit. The names of the log files are set in
@file{policy.h}, and may be overridden in the configuration file
(@pxref{config File}). By default they are are
@@ -601,7 +592,7 @@
find the @code{savelog} program in the @file{contrib} directory to be of
use. There is a manual page for it in @file{contrib} as well.
-@@ -3012,8 +3012,8 @@
+@@ -3012,8 +3012,8 @@ upload files to your system.
@example
# No files may be transferred to this system
unknown receive-request no
@@ -612,7 +603,7 @@
# Only files in the public directory may be sent (the default anyhow)
unknown remote-send ~
@end example
-@@ -3022,26 +3022,26 @@
+@@ -3022,26 +3022,26 @@ unknown remote-send ~
Setting the public directory is convenient for the systems which call
in. It permits to request a file by prefixing it with @file{~/}. For
example, assuming your system is known as @samp{server}, then to
@@ -644,7 +635,7 @@
unknown remote-receive ~/upload
@end example
-@@ -3611,7 +3611,7 @@
+@@ -3611,7 +3611,7 @@ will be used to get the host name, if po
@item spool @var{string}
@findex spool
@cindex spool directory, setting
@@ -653,7 +644,7 @@
Specify the spool directory. The default is from @file{policy.h}. This
is where UUCP files are queued. Status files and various sorts of
-@@ -3622,7 +3622,7 @@
+@@ -3622,7 +3622,7 @@ it.
@findex pubdir in config file
@cindex public directory
@cindex uucppublic
@@ -662,7 +653,7 @@
Specify the public directory. The default is from @file{policy.h}.
When a file is named using a leading @kbd{~/}, it is taken from or to
-@@ -4839,11 +4839,11 @@
+@@ -4839,11 +4839,11 @@ be sent to the remote system when reques
@command{uucp} or @command{uux}). The directories in the list should be
separated by whitespace. A @samp{~} may be used for the public
directory. On a Unix system, this is typically
@@ -676,7 +667,7 @@
@end example
Listing a directory allows all files within the directory and all
-@@ -4851,12 +4851,12 @@
+@@ -4851,12 +4851,12 @@ subdirectories to be sent. Directories
them with an exclamation point. For example:
@example
@@ -692,7 +683,7 @@
directories is read from left to right, and the last directory to apply
takes effect; this means that directories should be listed from top
down. The default is the root directory (i.e., any file at all may be
-@@ -6035,8 +6035,8 @@
+@@ -6035,8 +6035,8 @@ process still exists, the lock attempt f
is deleted and the locking algorithm is retried.
Older UUCP packages put the lock files in the main UUCP spool directory,
@@ -703,7 +694,7 @@
@file{/etc/locks}.
The original UUCP lock file format encodes the process ID as a four byte
-@@ -6202,7 +6202,7 @@
+@@ -6202,7 +6202,7 @@ following @file{X.} file:
@example
U ian test1
F D.test1N003r qux
@@ -712,7 +703,7 @@
F D.test1N003s
I D.test1N003s
C cat - ~ian/bar qux
-@@ -6214,7 +6214,7 @@
+@@ -6214,7 +6214,7 @@ the command is executed, the latter file
directory under the name @samp{qux}. Note that since the file
@file{~ian/bar} is already on the execution system, no action need be
taken for it. The standard output will be collected in a file, then
@@ -722,7 +713,7 @@
@ifset faq
--- uulog.1
-+++ uulog.1 2006-06-22 16:03:34.000000000 +0200
++++ uulog.1 2006-06-22 14:03:34.000000000 +0000
@@ -0,0 +1,128 @@
+.TH uulog 1 "Taylor UUCP 1.07"
+.\" manual page source format generated by PolyglotMan v3.0.8+X.Org,
@@ -853,7 +844,7 @@
+.RE
+
--- uuname.1
-+++ uuname.1 2006-06-22 16:03:52.000000000 +0200
++++ uuname.1 2006-06-22 14:03:52.000000000 +0000
@@ -0,0 +1,72 @@
+.TH uuname 1 "Taylor UUCP 1.07"
+.\" manual page source format generated by PolyglotMan v3.0.8+X.Org,
@@ -928,7 +919,7 @@
+.RE
+
--- uupick.1
-+++ uupick.1 2006-06-22 16:04:13.000000000 +0200
++++ uupick.1 2006-06-22 14:04:13.000000000 +0000
@@ -0,0 +1,72 @@
+.TH uupick 1 "Taylor UUCP 1.07"
+.\" manual page source format generated by PolyglotMan v3.0.8+X.Org,
@@ -1003,7 +994,7 @@
+.B info uucp 'Invoking uupick'
+.RE
--- uusched.8
-+++ uusched.8 2006-06-22 16:02:20.000000000 +0200
++++ uusched.8 2006-06-22 14:02:20.000000000 +0000
@@ -0,0 +1,25 @@
+.TH uusched 8 "Taylor UUCP 1.07"
+.\" manual page source format generated by PolyglotMan v3.0.8+X.Org,
@@ -1031,7 +1022,7 @@
+.B info uucp 'Invoking uusched'
+.RE
--- uustat.1
-+++ uustat.1 2006-06-22 12:58:25.000000000 +0200
++++ uustat.1 2006-06-22 10:58:25.000000000 +0000
@@ -1,4 +1,6 @@
-''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
+'\"
@@ -1041,7 +1032,7 @@
.SH NAME
uustat \- UUCP status inquiry and control
--- uuto.1
-+++ uuto.1 2006-06-22 16:10:32.000000000 +0200
++++ uuto.1 2006-06-22 14:10:32.000000000 +0000
@@ -0,0 +1,36 @@
+.TH uuto 1 "Taylor UUCP 1.07"
+.\" manual page source format generated by PolyglotMan v3.0.8+X.Org,
@@ -1080,7 +1071,7 @@
+.RE
+
--- uux.1
-+++ uux.1 2006-06-22 12:58:25.000000000 +0200
++++ uux.1 2006-06-22 10:58:25.000000000 +0000
@@ -1,4 +1,6 @@
-''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
+'\"
@@ -1090,7 +1081,7 @@
.SH NAME
uux \- Remote command execution over UUCP
--- uuxqt.8
-+++ uuxqt.8 2006-06-22 12:58:25.000000000 +0200
++++ uuxqt.8 2006-06-22 10:58:25.000000000 +0000
@@ -1,4 +1,6 @@
-''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
+'\"
@@ -1100,8 +1091,8 @@
.SH NAME
uuxqt \- UUCP execution daemon
--- unix/lock.c
-+++ unix/lock.c 2006-06-22 12:58:25.000000000 +0200
-@@ -429,6 +429,7 @@
++++ unix/lock.c 2006-06-22 10:58:25.000000000 +0000
+@@ -429,6 +429,7 @@ fsdo_lock (zlock, fspooldir, pferr)
zerr = "remove";
break;
}
@@ -1110,8 +1101,8 @@
continue;
}
--- unix/portnm.c
-+++ unix/portnm.c 2006-06-22 12:58:25.000000000 +0200
-@@ -32,7 +32,7 @@
++++ unix/portnm.c 2006-06-22 10:58:25.000000000 +0000
+@@ -32,7 +32,7 @@ zsysdep_port_name (ftcp_port)
#if HAVE_TCP
{
@@ -1121,8 +1112,8 @@
clen = sizeof (struct sockaddr);
--- unix/serial.c
-+++ unix/serial.c 2006-06-22 12:58:25.000000000 +0200
-@@ -36,6 +36,7 @@
++++ unix/serial.c 2006-06-22 10:58:25.000000000 +0000
+@@ -36,6 +36,7 @@ const char serial_rcsid[] = "$Id: serial
#include <errno.h>
#include <ctype.h>
@@ -1130,7 +1121,7 @@
#if HAVE_SYS_PARAM_H
#include <sys/param.h>
-@@ -999,6 +1000,45 @@
+@@ -1016,6 +1017,45 @@ static struct sbaud_table
#ifdef B4000000
{ B4000000, 4000000 },
#endif
@@ -1176,7 +1167,7 @@
{ B0, 0 }
};
-@@ -2540,8 +2580,20 @@
+@@ -2557,8 +2597,20 @@ fsysdep_conn_read (qconn, zbuf, pclen, c
else
csleepchars = MAX_INPUT - 10;
@@ -1198,8 +1189,8 @@
if (isleep > 10)
{
--- unix/tcp.c
-+++ unix/tcp.c 2006-06-22 12:58:25.000000000 +0200
-@@ -395,7 +395,7 @@
++++ unix/tcp.c 2006-06-22 10:58:25.000000000 +0000
+@@ -395,7 +395,7 @@ ftcp_open (qconn, ibaud, fwait, fuser)
while (! FGOT_SIGNAL ())
{
sockaddr_storage speer;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |