OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 05-Dec-2002 15:48:08
Branch: HEAD Handle: 2002120514480701
Modified files:
openpkg-src/sendmail cf.tar etc.sendmail.tar sendmail-db4.patch
sendmail.spec
openpkg-web news.txt
Log:
db4.1 adaption, fix config and permissions
Summary:
Revision Changes Path
1.3 BLOB openpkg-src/sendmail/cf.tar
1.5 BLOB openpkg-src/sendmail/etc.sendmail.tar
1.2 +110 -3 openpkg-src/sendmail/sendmail-db4.patch
1.42 +15 -4 openpkg-src/sendmail/sendmail.spec
1.2197 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/sendmail/cf.tar
============================================================
$ cvs update -p -r1.2 cf.tar >cf.tar.old
$ cvs update -p -r1.3 cf.tar >cf.tar.new
$ diff -u cf.tar.old cf.tar.new
Binary files cf.tar.old and cf.tar.new differ
Index: openpkg-src/sendmail/etc.sendmail.tar
============================================================
$ cvs update -p -r1.4 etc.sendmail.tar >etc.sendmail.tar.old
$ cvs update -p -r1.5 etc.sendmail.tar >etc.sendmail.tar.new
$ diff -u etc.sendmail.tar.old etc.sendmail.tar.new
Binary files etc.sendmail.tar.old and etc.sendmail.tar.new differ
Index: openpkg-src/sendmail/sendmail-db4.patch
============================================================
$ cvs diff -u -r1.1 -r1.2 sendmail-db4.patch
--- openpkg-src/sendmail/sendmail-db4.patch 14 Oct 2002 20:55:23 -0000 1.1
+++ openpkg-src/sendmail/sendmail-db4.patch 5 Dec 2002 14:48:08 -0000 1.2
@@ -1,11 +1,11 @@
diff -Naur sendmail-8.12.6.orig/libsmdb/smdb2.c sendmail-8.12.6/libsmdb/smdb2.c
---- sendmail-8.12.6.orig/libsmdb/smdb2.c Sat May 25 01:09:11 2002
-+++ sendmail-8.12.6/libsmdb/smdb2.c Mon Oct 14 22:37:39 2002
+--- sendmail-8.12.6.orig/libsmdb/smdb2.c Wed Dec 4 17:24:48 2002
++++ sendmail-8.12.6/libsmdb/smdb2.c Thu Dec 5 14:29:52 2002
@@ -523,7 +523,11 @@
}
}
-+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1)
++#if (DB_VERSION_MAJOR >=4 && DB_VERSION_MINOR >= 1)
+ result = (*db)->open(*db, NULL, db_name, NULL, db_type, db_flags, DBMMODE);
+#else
result = (*db)->open(*db, db_name, NULL, db_type, db_flags, DBMMODE);
@@ -13,6 +13,113 @@
if (result != 0)
{
(void) (*db)->close(*db, 0);
+@@ -571,7 +575,6 @@
+ SMDB_USER_INFO *user_info;
+ SMDB_DBPARAMS *db_params;
+ {
+- bool lockcreated = false;
+ int result;
+ int db_flags;
+ int lock_fd;
+@@ -580,7 +583,6 @@
+ SMDB_DB2_DATABASE *db2;
+ DB *db;
+ DBTYPE db_type;
+- struct stat stat_info;
+ char db_file_name[MAXPATHLEN];
+
+ *database = NULL;
+@@ -590,27 +592,7 @@
+ if (result != SMDBE_OK)
+ return result;
+
+- result = smdb_setup_file(db_name, SMDB2_FILE_EXTENSION,
+- mode_mask, sff, user_info, &stat_info);
+- if (result != SMDBE_OK)
+- return result;
+-
+- lock_fd = -1;
+-
+- if (stat_info.st_mode == ST_MODE_NOFILE &&
+- bitset(mode, O_CREAT))
+- lockcreated = true;
+-
+- result = smdb_lock_file(&lock_fd, db_name, mode, sff,
+- SMDB2_FILE_EXTENSION);
+- if (result != SMDBE_OK)
+- return result;
+-
+- if (lockcreated)
+- {
+- mode |= O_TRUNC;
+- mode &= ~(O_CREAT|O_EXCL);
+- }
++ lock_fd = -1;
+
+ smdb_db = smdb_malloc_database();
+ if (smdb_db == NULL)
+@@ -620,8 +602,6 @@
+ if (db2 == NULL)
+ return SMDBE_MALLOC;
+
+- db2->smdb2_lock_fd = lock_fd;
+-
+ db_type = smdb_type_to_db2_type(type);
+
+ db = NULL;
+@@ -634,7 +614,7 @@
+ if (mode == O_RDONLY)
+ db_flags |= DB_RDONLY;
+ # if !HASFLOCK && defined(DB_FCNTL_LOCKING)
+- db_flags |= DB_FCNTL_LOCKING;
++ db_flags |= DB_FCNTL_LOCKING;
+ # endif /* !HASFLOCK && defined(DB_FCNTL_LOCKING) */
+
+ result = smdb_db_open_internal(db_file_name, db_type,
+@@ -645,6 +625,8 @@
+ result = db->fd(db, &db_fd);
+ if (result == 0)
+ result = SMDBE_OK;
++ else
++ result = SMDBE_BAD_OPEN;
+ }
+ else
+ {
+@@ -655,12 +637,17 @@
+ result = SMDBE_BAD_OPEN;
+ }
+
+- if (result == SMDBE_OK)
+- result = smdb_filechanged(db_name, SMDB2_FILE_EXTENSION, db_fd,
+- &stat_info);
++ if (result == SMDBE_OK) {
++ result = smdb_lock_file(&lock_fd, db_name, mode, sff,
++ SMDB2_FILE_EXTENSION);
++ if (result != SMDBE_OK)
++ lock_fd = -1; /* paranoia */
++ }
+
+ if (result == SMDBE_OK)
+ {
++ db2->smdb2_lock_fd = lock_fd;
++
+ /* Everything is ok. Setup driver */
+ db2->smdb2_db = db;
+
+@@ -680,10 +667,12 @@
+ return SMDBE_OK;
+ }
+
++ if (lock_fd != -1)
++ smdb_unlock_file(lock_fd);
++
+ if (db != NULL)
+ db->close(db, 0);
+
+- smdb_unlock_file(db2->smdb2_lock_fd);
+ free(db2);
+ smdb_free_database(smdb_db);
+
diff -Naur sendmail-8.12.6.orig/sendmail/map.c sendmail-8.12.6/sendmail/map.c
--- sendmail-8.12.6.orig/sendmail/map.c Sat Aug 10 00:23:13 2002
+++ sendmail-8.12.6/sendmail/map.c Mon Oct 14 22:37:35 2002
Index: openpkg-src/sendmail/sendmail.spec
============================================================
$ cvs diff -u -r1.41 -r1.42 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 12 Nov 2002 13:41:57 -0000 1.41
+++ openpkg-src/sendmail/sendmail.spec 5 Dec 2002 14:48:08 -0000 1.42
@@ -45,7 +45,7 @@
Group: Mail
License: BSD
Version: 8.12.6
-Release: 20021112
+Release: 20021205
# list of sources
Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz
@@ -53,7 +53,9 @@
Source2: cf.tar
Source3: fsl.sendmail
Source4: rc.sendmail
-Patch0: sendmail-db4.patch
+Patch0: http://www.sendmail.org/patches/smrsh-20020924.patch
+Patch1: http://www.sendmail.org/patches/proto.m4.8.649.2.13
+Patch2: sendmail-db4.patch
# build information
Prefix: %{l_prefix}
@@ -74,7 +76,13 @@
# unpack standard tarballs
%setup0 -q -c
%setup1 -q -T -D -a 1
- %patch0 -p0
+ ( cd sendmail-%{version}/smrsh ;
+ %patch0 -p0
+ )
+ ( cd sendmail-%{version}/cf/m4
+ %patch1 -p0
+ )
+ %patch2 -p0
# add own M4 stuff to Sendmail configuration set
( cd sendmail-%{version}
@@ -244,7 +252,9 @@
# create important files which have to be present from the beginning
%{l_shtool} mkdir -f -p -m 700 \
$RPM_BUILD_ROOT%{l_prefix}/var/sendmail/mqueue \
- $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/clientmqueue
+ $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/mqueue/.hoststat \
+ $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/clientmqueue \
+ $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/clientmqueue/.hoststat
touch $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/sendmail.in.pid
touch $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/sendmail.out.pid
touch $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/sendmail.log
@@ -266,6 +276,7 @@
'%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/purgestat' \
'%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/vacation' \
'%attr(4755,root,%{l_mgrp}) %{l_prefix}/libexec/sendmail/smrsh' \
+ '%attr(755,root,%{l_mgrp}) %{l_prefix}/etc/sendmail' \
'%config %{l_prefix}/etc/sendmail/*' \
'%config %attr(644,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/ca.crt' \
'%config %attr(644,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.crt' \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2196 -r1.2197 news.txt
--- openpkg-web/news.txt 5 Dec 2002 13:05:20 -0000 1.2196
+++ openpkg-web/news.txt 5 Dec 2002 14:48:07 -0000 1.2197
@@ -1,3 +1,4 @@
+05-Dec-2002: Upgraded package: P<sendmail-8.12.6-20021205>
05-Dec-2002: Upgraded package: P<mozilla-1.2.1-20021205>
05-Dec-2002: Upgraded package: P<openldap-2.1.9-20021205>
05-Dec-2002: Upgraded package: P<sasl-2.1.9-20021205>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
