head 1.2; access; symbols OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.2 OPENPKG_E1_FP:1.2 OPENPKG_2_STABLE_MP:1.2 OPENPKG_2_STABLE_20061018:1.2 OPENPKG_2_STABLE_20060622:1.2 OPENPKG_2_STABLE:1.2.0.14 OPENPKG_2_STABLE_BP:1.2 OPENPKG_2_5_RELEASE:1.2 OPENPKG_2_5_SOLID:1.2.0.12 OPENPKG_2_5_SOLID_BP:1.2 OPENPKG_2_4_RELEASE:1.2 OPENPKG_2_4_SOLID:1.2.0.10 OPENPKG_2_4_SOLID_BP:1.2 OPENPKG_CW_FP:1.2 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.8 OPENPKG_2_3_SOLID_BP:1.2 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.6 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.4 OPENPKG_2_1_SOLID_BP:1.2 OPENPKG_2_0_RELEASE:1.2 OPENPKG_2_0_SOLID:1.2.0.2 OPENPKG_2_0_SOLID_BP:1.2 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.2 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.2 date 2003.03.29.09.05.25; author mlelstv; state Exp; branches; next 1.1; 1.1 date 2003.01.14.14.10.01; author thl; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2003.07.24.20.50.45; author rse; state Exp; branches; next ; desc @@ 1.2 log @upgrading package: suck 4.3.1 -> 4.3.2 @ text @--- suckutils.h.orig Sun Nov 8 16:38:32 1998 +++ suckutils.h Tue Jan 14 15:04:31 2003 @@@@ -11,6 +11,8 @@@@ int do_lockfile(PMaster); #endif +#undef FP_SET +#undef FP_GET enum { FP_SET, FP_GET, FP_SET_POSTFIX, FP_GET_NOPOSTFIX, FP_GET_POSTFIX}; /* get or set call for full_path() */ enum { FP_TMPDIR, FP_DATADIR, FP_MSGDIR, FP_NONE }; /* which dir in full_path() */ #define FP_NR_DIRS 3 /* this must match nr of enums */ --- rpost.c.orig Tue Jan 14 15:05:43 2003 +++ rpost.c Tue Jan 14 15:05:54 2003 @@@@ -27,7 +27,7 @@@@ #ifndef PL_na # define PL_na (na) #endif -#endif /* OLD_PERL */u +#endif /* OLD_PERL */ #endif #ifdef HAVE_DIRENT_H --- killfile.c.orig Tue Aug 28 01:55:03 2001 +++ killfile.c Tue Jan 14 15:08:55 2003 @@@@ -55,7 +55,6 @@@@ void print_debug(PKillStruct, const char *); void debug_one_kill(POneKill); void add_to_linkedlist(pmy_regex *, pmy_regex); -const char *strnstr(const char *, const char *); pmy_regex regex_scan(char *, char, int, int, char); int regex_check(char *, pmy_regex, int); @ 1.1 log @port to Solaris and simplify patching @ text @a11 8 --- db.h.orig Sun Feb 7 20:27:00 1999 +++ db.h Tue Jan 14 15:02:23 2003 @@@@ -9,4 +9,4 @@@@ int db_open(PMaster); void db_close(PMaster); -#endif _SUCK_DB_H +#endif /* _SUCK_DB_H */ @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @d12 8 @