upgrading package: inn 2.3.3 -> 2.3.4

inn/inn-db4.patch

@@ -1,158 +0,0 @@
-diff -Naur inn-2.3.3.orig/storage/ovdb/ovdb.c inn-2.3.3/storage/ovdb/ovdb.c
---- inn-2.3.3.orig/storage/ovdb/ovdb.c	Mon May  6 08:02:07 2002
-+++ inn-2.3.3/storage/ovdb/ovdb.c	Mon Oct 14 21:37:07 2002
-@@ -99,7 +99,7 @@
- #error Need BerkeleyDB 2.6.x, 2.7.x, or 3.x
- #endif
- #else
--#if DB_VERSION_MAJOR != 3
-+#if DB_VERSION_MAJOR != 3 && DB_VERSION_MAJOR != 4
- #error Need BerkeleyDB 2.6.x, 2.7.x, or 3.x
- #endif
- #endif
-@@ -401,13 +401,23 @@
-     if(ovdb_conf.pagesize > 0)
- 	(dbs[which])->set_pagesize(dbs[which], ovdb_conf.pagesize);
- 
-+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MAJOR >= 1)
-+/* starting sometime early db 4.X, db->open gets a new parameter */
-+    if(ret = (dbs[which])->open(dbs[which], 0, _dbnames[which], NULL,
-+        DB_BTREE, _db_flags, 0666)) {
-+	(dbs[which])->close(dbs[which], 0);
-+	dbs[which] = NULL;
-+	return ret;
-+    }
-+#else
-     if(ret = (dbs[which])->open(dbs[which], _dbnames[which], NULL, DB_BTREE,
- 		_db_flags, 0666)) {
- 	(dbs[which])->close(dbs[which], 0);
- 	dbs[which] = NULL;
- 	return ret;
-     }
--#endif
-+#endif /* #if DB_VERSION_MAJOR >= 4 */
-+#endif /* #if DB_VERSION_MAJOR == 2 */
-     return 0;
- }
- 
-@@ -590,7 +600,7 @@
-     return TRUE;
- }
- 
--#if DB_VERSION_MAJOR == 3
-+#if DB_VERSION_MAJOR >= 3
- static int upgrade_database(char *name)
- {
-     int ret;
-@@ -659,7 +669,7 @@
-     if(flags & OVDB_RECOVER)
- 	ai_flags |= DB_RECOVER;
- 
--#if DB_VERSION_MAJOR == 2 || DB_VERSION_MINOR < 2
-+#if DB_VERSION_MAJOR == 2 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR < 2)
-     if(ovdb_conf.txn_nosync)
- 	ai_flags |= DB_TXN_NOSYNC;
- #endif
-@@ -697,12 +707,12 @@
-     OVDBenv->set_errcall(OVDBenv, OVDBerror);
-     OVDBenv->set_cachesize(OVDBenv, 0, ovdb_conf.cachesize, 1);
- 
--#if DB_VERSION_MINOR >= 2
-+#if (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2) || DB_VERSION_MAJOR >= 4
-     if(ovdb_conf.txn_nosync)
- 	OVDBenv->set_flags(OVDBenv, DB_TXN_NOSYNC, 1);
- #endif
- 
--#if DB_VERSION_MINOR == 0
-+#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 0
-     if(ret = OVDBenv->open(OVDBenv, ovdb_conf.home, NULL, ai_flags, 0666)) {
- #else
-     if(ret = OVDBenv->open(OVDBenv, ovdb_conf.home, ai_flags, 0666)) {
-@@ -726,12 +736,22 @@
- 	syslog(L_FATAL, "OVDB: open: db_create: %s", db_strerror(ret));
- 	return ret;
-     }
--    if(ret = vdb->open(vdb, "version", NULL, DB_BTREE,
-+
-+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MAJOR >= 1)
-+/* starting sometime early db 4.X, db->open gets a new parameter */
-+    if(ret = vdb->open(vdb, 0, "version", NULL, DB_BTREE,
- 		_db_flags, 0666)) {
- 	vdb->close(vdb, 0);
- 	syslog(L_FATAL, "OVDB: open: version->open: %s", db_strerror(ret));
- 	return ret;
-     }
-+#else
-+    if(ret = vdb->open(vdb, "version", NULL, DB_BTREE, _db_flags, 0666)) {
-+        vdb->close(vdb, 0);
-+        syslog(L_FATAL, "OVDB: open: version->open: %s", db_strerror(ret));
-+        return ret;
-+    }
-+#endif /* DB_VERSION_MAJOR >= 4 */
- #endif /* DB_VERSION_MAJOR == 2 */
- 
-     memset(&key, 0, sizeof key);
-@@ -841,33 +861,62 @@
- 	syslog(L_FATAL, "OVDB: open: db_create: %s", db_strerror(ret));
- 	return FALSE;
-     }
-+
-+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MAJOR >= 1)
-+/* starting sometime early db 4.X, db->open gets a new parameter */
-+    if(ret = groupstats->open(groupstats, 0, "groupstats", NULL,
-+        DB_BTREE, _db_flags, 0666)) {
-+	groupstats->close(groupstats, 0);
-+	syslog(L_FATAL, "OVDB: open: groupstats->open: %s", db_strerror(ret));
-+	return FALSE;
-+    }
-+#else
-     if(ret = groupstats->open(groupstats, "groupstats", NULL, DB_BTREE,
- 		_db_flags, 0666)) {
- 	groupstats->close(groupstats, 0);
- 	syslog(L_FATAL, "OVDB: open: groupstats->open: %s", db_strerror(ret));
- 	return FALSE;
-     }
-+#endif /* #if DB_VERSION_MAJOR >= 4 */
-     if(ret = db_create(&groupsbyname, OVDBenv, 0)) {
- 	syslog(L_FATAL, "OVDB: open: db_create: %s", db_strerror(ret));
- 	return FALSE;
-     }
-+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MAJOR >= 1)
-+    if(ret = groupsbyname->open(groupsbyname, 0, "groupsbyname", NULL, DB_HASH,
-+		_db_flags, 0666)) {
-+	groupsbyname->close(groupsbyname, 0);
-+	syslog(L_FATAL, "OVDB: open: groupsbyname->open: %s", db_strerror(ret));
-+	return FALSE;
-+    }
-+#else
-     if(ret = groupsbyname->open(groupsbyname, "groupsbyname", NULL, DB_HASH,
- 		_db_flags, 0666)) {
- 	groupsbyname->close(groupsbyname, 0);
- 	syslog(L_FATAL, "OVDB: open: groupsbyname->open: %s", db_strerror(ret));
- 	return FALSE;
-     }
-+#endif /* #if DB_VERSION_MAJOR >= 4 */
-     if(ret = db_create(&groupaliases, OVDBenv, 0)) {
- 	syslog(L_FATAL, "OVDB: open: db_create: %s", db_strerror(ret));
- 	return FALSE;
-     }
-+#if (DB_VERSION_MAJOR >= 4 && DB_VERSION_MAJOR >= 1)
-+    if(ret = groupaliases->open(groupaliases, 0, "groupaliases", NULL, DB_HASH,
-+		_db_flags, 0666)) {
-+	groupaliases->close(groupaliases, 0);
-+	syslog(L_FATAL, "OVDB: open: groupaliases->open: %s", db_strerror(ret));
-+	return FALSE;
-+    }
-+#else
-     if(ret = groupaliases->open(groupaliases, "groupaliases", NULL, DB_HASH,
- 		_db_flags, 0666)) {
- 	groupaliases->close(groupaliases, 0);
- 	syslog(L_FATAL, "OVDB: open: groupaliases->open: %s", db_strerror(ret));
- 	return FALSE;
-     }
--#endif
-+#endif /* #if DB_VERSION_MAJOR >= 4 */
-+#endif /* #if DB_VERSION_MAJOR == 2 */
- 
-     Cutofflow = FALSE;
-     return TRUE;

inn/inn-watch.patch

@@ -1,5 +1,5 @@
---- inn-2.3.3/scripts/innwatch.in.dist  Wed Dec  4 15:02:05 2002
-+++ inn-2.3.3/scripts/innwatch.in       Wed Dec  4 15:05:21 2002
+--- inn-2.3.4/scripts/innwatch.in.dist  Wed Dec  4 15:02:05 2002
++++ inn-2.3.4/scripts/innwatch.in       Wed Dec  4 15:05:21 2002
 @@ -126,7 +126,12 @@
  NEXTSLEEP=1
  HASEXITED=false

inn/inn.spec

@@ -24,7 +24,7 @@
 ##
 
 #   package versions
-%define       V_inn        2.3.3
+%define       V_inn        2.3.4
 %define       V_cleanfeed  20010805
 
 #   package information
@@ -37,15 +37,14 @@ Distribution: OpenPKG [BASE]
 Group:        News
 License:      ISC
 Version:      %{V_inn}
-Release:      20021204
+Release:      20030101
 
 #   list of sources
 Source0:      ftp://ftp.isc.org/isc/inn/inn-%{V_inn}.tar.gz
 Source1:      http://www.bofh.it/~md/cleanfeed/cleanfeed-%{V_cleanfeed}.tgz
 Source2:      rc.inn
 Source3:      fsl.inn
-Patch0:       inn-db4.patch
-Patch1:       inn-watch.patch
+Patch0:       inn.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -66,7 +65,6 @@ AutoReqProv:  no
     %setup0 -q -c
     %setup1 -q -T -D -a 1
     %patch0 -p0
-    %patch1 -p0
 
 %build
     #   build inn