head 1.11; access; symbols OPENPKG_E1_MP_HEAD:1.9 OPENPKG_E1_MP:1.9 OPENPKG_E1_MP_2_STABLE:1.8.2.1 OPENPKG_E1_FP:1.8.2.1 OPENPKG_2_STABLE_MP:1.9 OPENPKG_2_STABLE_20061018:1.8.2.1 OPENPKG_2_STABLE_20060622:1.8 OPENPKG_2_STABLE:1.8.0.2 OPENPKG_2_STABLE_BP:1.8 OPENPKG_2_5_RELEASE:1.7 OPENPKG_2_5_SOLID:1.7.0.6 OPENPKG_2_5_SOLID_BP:1.7 OPENPKG_2_4_RELEASE:1.7 OPENPKG_2_4_SOLID:1.7.0.4 OPENPKG_2_4_SOLID_BP:1.7 OPENPKG_CW_FP:1.7 OPENPKG_2_3_RELEASE:1.7 OPENPKG_2_3_SOLID:1.7.0.2 OPENPKG_2_3_SOLID_BP:1.7 OPENPKG_2_2_RELEASE:1.5 OPENPKG_2_2_SOLID:1.5.0.6 OPENPKG_2_2_SOLID_BP:1.5 OPENPKG_2_1_RELEASE:1.5 OPENPKG_2_1_SOLID:1.5.0.4 OPENPKG_2_1_SOLID_BP:1.5 OPENPKG_2_0_RELEASE:1.5 OPENPKG_2_0_SOLID:1.5.0.2 OPENPKG_2_0_SOLID_BP:1.5 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE_MP:1.3 OPENPKG_1_2_RELEASE:1.1 OPENPKG_1_2_SOLID:1.1.0.4 OPENPKG_1_2_SOLID_BP:1.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_BP:1.1; locks; strict; comment @# @; 1.11 date 2008.05.10.09.30.15; author rse; state Exp; branches; next 1.10; commitid dUvrwBrUvbJ5Ro2t; 1.10 date 2007.09.26.22.03.58; author rse; state Exp; branches; next 1.9; commitid ARMuUgBRY1j3kizs; 1.9 date 2006.09.29.06.04.41; author rse; state Exp; branches; next 1.8; commitid PmALntIpZ9HnEGOr; 1.8 date 2006.03.10.21.19.43; author rse; state Exp; branches 1.8.2.1; next 1.7; commitid j0v3LE4DmANQeGor; 1.7 date 2004.12.24.11.06.26; author rse; state Exp; branches; next 1.6; 1.6 date 2004.11.13.14.53.31; author rse; state Exp; branches; next 1.5; 1.5 date 2004.01.08.11.16.37; author thl; state Exp; branches; next 1.4; 1.4 date 2003.08.21.09.10.32; author rse; state Exp; branches; next 1.3; 1.3 date 2003.05.11.08.49.08; author rse; state Exp; branches; next 1.2; 1.2 date 2003.03.21.09.44.27; author rse; state Exp; branches; next 1.1; 1.1 date 2003.01.01.08.28.55; author rse; state Exp; branches 1.1.2.1; next ; 1.8.2.1 date 2006.10.16.14.51.15; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; 1.1.2.1 date 2003.07.24.20.44.15; author rse; state Exp; branches 1.1.2.1.2.1; next ; 1.1.2.1.2.1 date 2004.01.08.08.29.30; author thl; state Exp; branches; next ; desc @@ 1.11 log @upgrading package: inn 2.4.3 -> 2.4.4 @ text @Index: scripts/innwatch.in --- scripts/innwatch.in.orig 2008-05-05 12:18:36 +0200 +++ scripts/innwatch.in 2008-05-10 10:30:24 +0200 @@@@ -126,7 +126,12 @@@@ NEXTSLEEP=1 HASEXITED=false -while { sleep ${NEXTSLEEP} & wait; } ; : ; do +SLEEPTINY=4 +while { sleep ${SLEEPTINY} & wait; } ; : ; do + NEXTSLEEP=`expr ${NEXTSLEEP} - ${SLEEPTINY}` + if [ $NEXTSLEEP -gt 0 ]; then + continue; + fi NEXTSLEEP=${INNWATCHSLEEPTIME} ## If news.daily is running, idle: we don't want to change the Index: site/Makefile --- site/Makefile.orig 2008-05-05 12:18:36 +0200 +++ site/Makefile 2008-05-10 10:30:59 +0200 @@@@ -140,7 +140,6 @@@@ chown $(NEWSUSER) $@@ chgrp $(NEWSGROUP) $@@ chmod $(FILEMODE) $@@ - $(PATHBIN)/makedbz -i -o ## Remove files that are unchanged from the release version. clean: @ 1.10 log @apply a patch from FreeBSD ports for fixing a 64-bit issue @ text @a0 33 Index: frontends/ovdb_stat.c --- frontends/ovdb_stat.c.orig 2006-03-20 05:14:57 +0100 +++ frontends/ovdb_stat.c 2007-09-27 00:01:57 +0200 @@@@ -266,13 +266,17 @@@@ { INT32, F(st_nobjects), -1, -1, "Current objects" }, { INT32, F(st_maxnobjects), -1, -1, "Maximum objects" }, #endif +#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4) { INT32, F(st_nconflicts), -1, -1, "Lock conflicts" }, +#endif { INT32, F(st_nrequests), -1, -1, "Lock requests" }, { INT32, F(st_nreleases), -1, -1, "Lock releases" }, { DIFF32, F(st_nrequests), F(st_nreleases), F(st_ndeadlocks), "Outstanding locks" }, #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0) +#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4) { INT32, F(st_nnowaits), -1, -1, "Lock requests that would have waited" }, #endif +#endif { INT32, F(st_ndeadlocks), -1, -1, "Deadlocks" }, #if DB_VERSION_MAJOR >= 4 { INT32, F(st_nlocktimeouts), -1, -1, "Lock timeouts" }, Index: innfeed/endpoint.c --- innfeed/endpoint.c.orig 2006-03-20 05:14:57 +0100 +++ innfeed/endpoint.c 2007-09-27 00:02:53 +0200 @@@@ -1644,7 +1644,7 @@@@ if (sigHandlers == NULL) { sigHandlers = xmalloc (sizeof(sigfn) * NSIG) ; - sigFlags = xmalloc (sizeof(int) * NSIG) ; + sigFlags = xmalloc (sizeof(sig_atomic_t) * NSIG) ; for (i = 0 ; i < NSIG ; i++) { sigHandlers [i] = NULL ; d2 2 a3 2 --- scripts/innwatch.in.orig 2006-03-20 05:14:57 +0100 +++ scripts/innwatch.in 2007-09-27 00:01:57 +0200 d19 5 a23 3 --- site/Makefile.orig 2006-03-20 05:14:57 +0100 +++ site/Makefile 2007-09-27 00:01:57 +0200 @@@@ -137,7 +137,6 @@@@ a24 2 $D$(PATH_HISTORY): touch $@@ a28 13 Index: storage/ovdb/ovdb.c --- storage/ovdb/ovdb.c.orig 2006-03-20 05:14:57 +0100 +++ storage/ovdb/ovdb.c 2007-09-27 00:01:57 +0200 @@@@ -1526,7 +1526,9 @@@@ OVDBenv->set_errcall(OVDBenv, OVDBerror); OVDBenv->set_cachesize(OVDBenv, 0, ovdb_conf.cachesize, 1); +#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 5) OVDBenv->set_lk_max(OVDBenv, ovdb_conf.maxlocks); +#endif #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2) if(ovdb_conf.txn_nosync) @ 1.9 log @fix building under DB 4.5 @ text @d3 1 a3 1 +++ frontends/ovdb_stat.c 2006-09-29 07:17:19 +0200 d22 12 d36 1 a36 1 +++ scripts/innwatch.in 2006-09-29 07:17:19 +0200 d53 1 a53 1 +++ site/Makefile 2006-09-29 07:17:19 +0200 d64 1 a64 1 +++ storage/ovdb/ovdb.c 2006-09-29 07:55:00 +0200 @ 1.8 log @fix building under latest DB 4.4 @ text @d1 21 d23 2 a24 2 --- scripts/innwatch.in.orig 2004-12-22 05:21:19 +0100 +++ scripts/innwatch.in 2004-12-24 11:31:18 +0100 d40 2 a41 2 --- site/Makefile.orig 2004-12-22 05:21:19 +0100 +++ site/Makefile 2004-12-24 12:01:24 +0100 d50 9 a58 9 Index: frontends/ovdb_stat.c --- frontends/ovdb_stat.c.orig 2004-12-22 05:21:19 +0100 +++ frontends/ovdb_stat.c 2006-03-10 22:14:12 +0100 @@@@ -266,13 +266,17 @@@@ { INT32, F(st_nobjects), -1, -1, "Current objects" }, { INT32, F(st_maxnobjects), -1, -1, "Maximum objects" }, #endif +#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4) { INT32, F(st_nconflicts), -1, -1, "Lock conflicts" }, d60 3 a62 11 { INT32, F(st_nrequests), -1, -1, "Lock requests" }, { INT32, F(st_nreleases), -1, -1, "Lock releases" }, { DIFF32, F(st_nrequests), F(st_nreleases), F(st_ndeadlocks), "Outstanding locks" }, #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0) +#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4) { INT32, F(st_nnowaits), -1, -1, "Lock requests that would have waited" }, #endif +#endif { INT32, F(st_ndeadlocks), -1, -1, "Deadlocks" }, #if DB_VERSION_MAJOR >= 4 { INT32, F(st_nlocktimeouts), -1, -1, "Lock timeouts" }, @ 1.8.2.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 21 Index: frontends/ovdb_stat.c --- frontends/ovdb_stat.c.orig 2006-03-20 05:14:57 +0100 +++ frontends/ovdb_stat.c 2006-09-29 07:17:19 +0200 @@@@ -266,13 +266,17 @@@@ { INT32, F(st_nobjects), -1, -1, "Current objects" }, { INT32, F(st_maxnobjects), -1, -1, "Maximum objects" }, #endif +#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4) { INT32, F(st_nconflicts), -1, -1, "Lock conflicts" }, +#endif { INT32, F(st_nrequests), -1, -1, "Lock requests" }, { INT32, F(st_nreleases), -1, -1, "Lock releases" }, { DIFF32, F(st_nrequests), F(st_nreleases), F(st_ndeadlocks), "Outstanding locks" }, #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0) +#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4) { INT32, F(st_nnowaits), -1, -1, "Lock requests that would have waited" }, #endif +#endif { INT32, F(st_ndeadlocks), -1, -1, "Deadlocks" }, #if DB_VERSION_MAJOR >= 4 { INT32, F(st_nlocktimeouts), -1, -1, "Lock timeouts" }, d2 2 a3 2 --- scripts/innwatch.in.orig 2006-03-20 05:14:57 +0100 +++ scripts/innwatch.in 2006-09-29 07:17:19 +0200 d19 2 a20 2 --- site/Makefile.orig 2006-03-20 05:14:57 +0100 +++ site/Makefile 2006-09-29 07:17:19 +0200 d29 17 a45 9 Index: storage/ovdb/ovdb.c --- storage/ovdb/ovdb.c.orig 2006-03-20 05:14:57 +0100 +++ storage/ovdb/ovdb.c 2006-09-29 07:55:00 +0200 @@@@ -1526,7 +1526,9 @@@@ OVDBenv->set_errcall(OVDBenv, OVDBerror); OVDBenv->set_cachesize(OVDBenv, 0, ovdb_conf.cachesize, 1); +#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 5) OVDBenv->set_lk_max(OVDBenv, ovdb_conf.maxlocks); d47 3 a49 3 #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2) if(ovdb_conf.txn_nosync) @ 1.7 log @upgrading package: inn 2.4.1 -> 2.4.2 @ text @d29 21 @ 1.6 log @Upgrade from DB 4.2 to 4.3 @ text @d1 3 a3 2 --- scripts/innwatch.in.dist Wed Dec 4 15:02:05 2002 +++ scripts/innwatch.in Wed Dec 4 15:05:21 2002 d18 8 a25 4 --- storage/ovdb/ovdb-private.h.orig 2004-01-07 23:47:19.000000000 +0100 +++ storage/ovdb/ovdb-private.h 2004-01-08 12:07:08.000000000 +0100 @@@@ -188,8 +188,7 @@@@ d27 2 a28 65 #define TRYAGAIN EAGAIN -#else -/* version 3 */ +#elif DB_VERSION_MAJOR == 3 #define TXN_START(label, tid) \ label: { \ @@@@ -209,6 +208,28 @@@@ #define TRYAGAIN DB_LOCK_DEADLOCK +#elif DB_VERSION_MAJOR == 4 + +#define TXN_START(label, tid) \ +label: { \ + int txn_ret; \ + txn_ret = OVDBenv->txn_begin(OVDBenv, NULL, &tid, 0); \ + if (txn_ret != 0) { \ + syslog(L_ERROR, "OVDB: " #label " txn_begin: %s", db_strerror(ret)); \ + tid = NULL; \ + } \ +} + +#define TXN_RETRY(label, tid) \ +{ tid->abort(tid); goto label; } + +#define TXN_ABORT(label, tid) tid->abort(tid) +#define TXN_COMMIT(label, tid) tid->commit(tid, 0) + +#define TRYAGAIN DB_LOCK_DEADLOCK + +#else +#error "unknown DB_VERSION_MAJOR" #endif /* DB_VERSION_MAJOR == 2 */ #endif /* USE_BERKELEY_DB */ Index: frontends/ovdb_stat.c --- frontends/ovdb_stat.c.orig 2004-01-07 23:47:19 +0100 +++ frontends/ovdb_stat.c 2004-11-13 13:55:17 +0100 @@@@ -586,7 +586,10 @@@@ { DB_BTREE_STAT *sp; -#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 3) +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 3) + if(db->stat(db, NULL, &sp, 0)) + return 1; +#elif DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >= 3) if(db->stat(db, &sp, 0)) return 1; #else @@@@ -646,7 +649,10 @@@@ #else DB_HASH_STAT *sp; -#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR <= 2 +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) + if(db->stat(db, NULL, &sp, 0)) + return 1; +#elif DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR <= 2 if(db->stat(db, &sp, NULL, 0)) return 1; #else @ 1.5 log @SA-2004.001-inn; fix broken DB4 support @ text @d60 27 @ 1.4 log @no need to spin around *such* fast @ text @d18 42 @ 1.3 log @upgrading package: inn 2.3.5 -> 2.4.0 @ text @d8 1 a8 1 +SLEEPTINY=1 @ 1.2 log @upgrading package: inn 2.3.4 -> 2.3.5 @ text @d1 2 a2 2 --- inn-2.3.5/scripts/innwatch.in.dist Wed Dec 4 15:02:05 2002 +++ inn-2.3.5/scripts/innwatch.in Wed Dec 4 15:05:21 2002 @ 1.1 log @upgrading package: inn 2.3.3 -> 2.3.4 @ text @d1 2 a2 2 --- 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 @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only] @ text @d1 2 a2 2 --- scripts/innwatch.in.dist Wed Dec 4 15:02:05 2002 +++ scripts/innwatch.in Wed Dec 4 15:05:21 2002 @ 1.1.2.1.2.1 log @SA-2004.001-inn @ text @a17 30 From: Russ Allbery To: inn-announce@@isc.org, bugtraq@@securityfocus.com Subject: [SECURITY] INN: Buffer overflow in control message handling Date: Wed, 07 Jan 2004 18:16:38 -0800 --- innd/art.c.orig 2003-05-04 15:10:14.000000000 -0700 +++ innd/art.c 2004-01-07 15:25:08.000000000 -0800 @@@@ -1773,7 +1773,7 @@@@ bool ARTpost(CHANNEL *cp) { - char *p, **groups, ControlWord[SMBUF], tmpbuff[32], **hops; + char *p, **groups, ControlWord[SMBUF], **hops, *controlgroup; int i, j, *isp, hopcount, oerrno, canpost; NEWSGROUP *ngp, **ngptr; SITE *sp; @@@@ -2185,9 +2185,10 @@@@ * or control. */ if (IsControl && Accepted && !ToGroup) { ControlStore = true; - FileGlue(tmpbuff, "control", '.', ControlWord); - if ((ngp = NGfind(tmpbuff)) == NULL) + controlgroup = concat("control.", ControlWord, (char *) 0); + if ((ngp = NGfind(controlgroup)) == NULL) ngp = NGfind(ARTctl); + free(controlgroup); ngp->PostCount = 0; ngptr = GroupPointers; *ngptr++ = ngp; @