OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 11-Dec-2003 17:25:24
Branch: HEAD Handle: 2003121116252202
Modified files:
openpkg-src/ripe-dbase rc.ripe-dbase ripe-dbase.patch ripe-dbase.spec
openpkg-web news.txt
Log:
add log file rotation, and back out Arnd patchcode
Summary:
Revision Changes Path
1.2 +11 -0 openpkg-src/ripe-dbase/rc.ripe-dbase
1.3 +0 -355 openpkg-src/ripe-dbase/ripe-dbase.patch
1.5 +1 -1 openpkg-src/ripe-dbase/ripe-dbase.spec
1.7728 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/rc.ripe-dbase
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.ripe-dbase
--- openpkg-src/ripe-dbase/rc.ripe-dbase 5 Dec 2003 17:07:08 -0000 1.1
+++ openpkg-src/ripe-dbase/rc.ripe-dbase 11 Dec 2003 16:25:24 -0000 1.2
@@ -52,3 +52,14 @@
rcService ripe_dbase active no && exit 0
ripe_dbase_signal HUP
+%daily -u @l_susr@
+ rcService ripe_dbase enable yes || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n ${ripe_dbase_numfiles} -s ${ripe_dbase_minsize} -d \
+ -z ${ripe_dbase_complevel} -o @l_susr@ -g @l_sgrp@ -m 644 \
+ -P "${ripe_dbase_prolog}" \
+ -E "${ripe_dbase_log_epilog} && rc ripe_dbase restart" \
+ @l_prefix@/var/ripe-dbase/log/whois_rip.err.log
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 ripe-dbase.patch
--- openpkg-src/ripe-dbase/ripe-dbase.patch 9 Dec 2003 17:42:54 -0000 1.2
+++ openpkg-src/ripe-dbase/ripe-dbase.patch 11 Dec 2003 16:25:24 -0000 1.3
@@ -1,156 +1,3 @@
-The patch code for ripe-dbase version 3.1 was written by Arnd VEHLING, under
-contract by Cable & Wireless. This particular patch was taken from Arnd's
-patch, and reformatted and reviewed for ripe-dbase version 3.2 by Michael
-Schloh von Bennewitz.
-Index: modules/df/defs.c
-diff -Nau modules/df/defs.c.orig modules/df/defs.c
---- modules/df/defs.c.orig Tue Dec 9 15:59:53 2003
-+++ modules/df/defs.c Tue Dec 9 16:02:05 2003
-@@ -78,6 +78,11 @@
- "peering-set",
- "rtr-set",
- "irt",
-+ "reg-id",
-+ "facility",
-+ "ticket",
-+ "range",
-+ "purpose",
- NULL
- }; /* Filter_names */
-
-@@ -131,6 +136,11 @@
- "peering_set",
- "rtr_set",
- "irt",
-+"reg_id",
-+"pop",
-+"ticket",
-+"range",
-+"purpose",
- NULL
- };
-
-Index: modules/df/defs.h
-diff -Nau modules/df/defs.h.orig modules/df/defs.h
---- modules/df/defs.h.orig Tue Dec 9 16:03:09 2003
-+++ modules/df/defs.h Tue Dec 9 16:03:39 2003
-@@ -92,6 +92,10 @@
- UD_AX_MR,
- UD_AX_MU,
- UD_AX_IT,
-+ UD_AX_AX,
-+ UD_AX_RG,
-+ UD_AX_PP,
-+ UD_AX_PU,
- UD_LEAF_,
- UD_LF_IF,
- UD_LF_RF,
-Index: modules/qc/query_command.c
-diff -Nau modules/qc/query_command.c.orig modules/qc/query_command.c
---- modules/qc/query_command.c.orig Thu Jul 3 09:55:33 2003
-+++ modules/qc/query_command.c Tue Dec 9 16:52:06 2003
-@@ -829,7 +829,8 @@
- is_ip_key = MA_isset(query_command->keytypes_bitmap, WK_IPADDRESS) ||
- MA_isset(query_command->keytypes_bitmap, WK_IPRANGE) ||
- MA_isset(query_command->keytypes_bitmap, WK_IPPREFIX) ||
-- MA_isset(query_command->keytypes_bitmap, WK_IP6PREFIX);
-+ MA_isset(query_command->keytypes_bitmap, WK_IP6PREFIX) ||
-+ MA_isset(query_command->keytypes_bitmap, WK_RANGE);
-
- /* check for use of IP flags on non-IP lookups */
- if ((ip_flag_used || query_command->d) && !is_ip_key) {
-Index: modules/qi/query_instructions.c
-diff -Nau modules/qi/query_instructions.c.orig modules/qi/query_instructions.c
---- modules/qi/query_instructions.c.orig Thu Jul 3 09:55:34 2003
-+++ modules/qi/query_instructions.c Tue Dec 9 17:09:53 2003
-@@ -396,7 +396,7 @@
- create_name_query(result_buff, q.query, qc->keys);
- addquery = 1;
- }
-- else if( q.keytype == WK_IPADDRESS ) { /* ifaddr sql lookups */
-+ else if( q.keytype == WK_IPADDRESS || q.keytype == WK_RANGE ) { /* ifaddr
sql lookups */
- ip_range_t myrang;
- unsigned begin, end;
- ip_keytype_t key_type;
-@@ -2103,6 +2103,11 @@
- ++++++++++++++++++++++++++++++++++++++*/
- static int valid_query(const Query_command *qc, const Query_t q) {
- int result=0;
-+
-+ if (q.keytype == WK_REGID || q.keytype == WK_POP ||
-+ q.keytype == WK_TICKET|| q.keytype == WK_RANGE ||
-+ q.keytype == WK_PURPOSE)
-+ return 1;
-
- if (MA_isset(qc->keytypes_bitmap, q.keytype) == 1) {
- if (q.query != NULL) {
-Index: modules/rp/rp_convert.c
-diff -Nau modules/rp/rp_convert.c.orig modules/rp/rp_convert.c
---- modules/rp/rp_convert.c.orig Tue Dec 9 17:12:53 2003
-+++ modules/rp/rp_convert.c Tue Dec 9 17:13:04 2003
-@@ -70,6 +70,7 @@
- int conv;
- rx_fam_t fam_id = RP_attr2fam( attr );
- switch( attr ) {
-+ case A_RA:
- case A_IN:
- conv = IP_rang_e2b(&(uni->u.in), astr);
- break;
-Index: modules/rp/rp_load.c
-diff -Nau modules/rp/rp_load.c.orig modules/rp/rp_load.c
---- modules/rp/rp_load.c.orig Thu Jul 3 09:55:36 2003
-+++ modules/rp/rp_load.c Tue Dec 9 17:19:31 2003
-@@ -61,6 +61,7 @@
- pack->type = attr;
- pack->d.origin = NULL;
- switch( attr ) {
-+ case A_RA:
- case A_IN:
- /*
- read 0-2 from inetnum
-@@ -160,7 +161,7 @@
-
- dieif( vu == NULL /* loading query undefined */ );
- #if 0
-- if( attr==A_IN && space==IP_V4 ) {
-+ if( ( attr==A_IN || attr==A_RA ) && space==IP_V4 ) {
- vu = "SELECT object_id,begin_in,end_in FROM inetnum WHERE thread_id = 0
AND begin_in >= 3238002688 AND end_in < 3254779904 ";
- }
- #endif
-@@ -254,7 +255,7 @@
-
- dieif ( SQ_execute_query(con, "LOCK TABLES "
- "route READ, inetnum READ, inet6num READ, "
-- "inaddr_arpa READ, domain READ, ip6int READ ",
-+ "inaddr_arpa READ, domain READ, ip6int READ, range READ ",
- NULL) == -1 );
-
- do {
-@@ -277,6 +278,9 @@
- break;
- }
- #endif
-+ if( !NOERR(err=RP_sql_load_attr_space( A_RA, IP_V4, reg_id, con))) {
-+ break;
-+ }
- /* CONSTCOND */
- } while(0);
-
-Index: modules/rp/rp_tree.c
-diff -Nau modules/rp/rp_tree.c.orig modules/rp/rp_tree.c
---- modules/rp/rp_tree.c.orig Thu Jul 3 09:55:36 2003
-+++ modules/rp/rp_tree.c Tue Dec 9 17:20:50 2003
-@@ -201,7 +201,9 @@
- if( NOERR(err=rp_init_attr_tree(reg_id, A_IN))
- && NOERR(err=rp_init_attr_tree(reg_id, A_RT))
- && NOERR(err=rp_init_attr_tree(reg_id, A_I6))
-- && NOERR(err=rp_init_attr_tree(reg_id, A_DN)) ) {
-+ && NOERR(err=rp_init_attr_tree(reg_id, A_DN))
-+ && NOERR(err=rp_init_attr_tree(reg_id, A_RA))) {
-+
- return RP_OK;
- }
-
Index: modules/sk/sk_socket.c
diff -Nau modules/sk/sk_socket.c.orig modules/sk/sk_socket.c
--- modules/sk/sk_socket.c.orig Thu Jul 3 09:55:41 2003
@@ -176,19 +23,6 @@
#else /* default is Solaris implementation */
hp = gethostbyname_r(hostname, &result, aliasbuf,
sizeof(aliasbuf), &error);
-Index: modules/sv/server.c
-diff -Nau modules/sv/server.c.orig modules/sv/server.c
---- modules/sv/server.c.orig Thu Jul 3 09:55:45 2003
-+++ modules/sv/server.c Tue Dec 9 17:22:24 2003
-@@ -656,7 +656,7 @@
- if(IS_UPDATE(update_mode)) {
- /* update_port = SK_atoport(CO_get_update_port(), "tcp"); */
- update_port = ca_get_srcupdateport(source_hdl);
-- printf("XXX htons(update_port)=%d\n", update_port);
-+ /* printf("XXX htons(update_port)=%d\n", update_port); */
- /* XXX ask AMRM to change the name of the function */
-
- SV_update_sock[source] = SK_getsock(SOCK_STREAM, update_port, 128,
INADDR_ANY);
Index: modules/ud/ud_main.c
diff -Nau modules/ud/ud_main.c.orig modules/ud/ud_main.c
--- modules/ud/ud_main.c.orig Thu Jul 3 09:55:49 2003
@@ -202,195 +36,6 @@
#else/* default is Solaris implementation */
hptr=gethostbyname_r(nrtm->server, &result, host_info, sizeof(host_info),
&error);
#endif
-Index: modules/ud/ud_comrol.c
-diff -Nau modules/ud/ud_comrol.c.orig modules/ud/ud_comrol.c
---- modules/ud/ud_comrol.c.orig Thu Jul 3 09:55:49 2003
-+++ modules/ud/ud_comrol.c Tue Dec 9 17:28:22 2003
-@@ -285,6 +285,10 @@
- case C_IN:
- case C_I6:
- case C_FS:
-+ case C_RA: /* Range object */
-+ case C_RI: /* Registry object */
-+ case C_PP: /* Pop object */
-+ case C_TK: /* Ticket object */
- /* if((tr->save)){ */
- /* Some special processing for tables with the second attribute */
- /* Update the second field of the table with query like one below */
-@@ -298,11 +302,18 @@
- break;
- /* netname for inetnum and inet6num */
- case C_IN:
-+ case C_RA:
- case C_I6: attr_type=A_NA;
- break;
- /* filter for filter-set */
- case C_FS: attr_type=A_FI;
- break;
-+ case C_RI: attr_type=A_WW; /* Save reg window size */
-+ break;
-+ case C_PP: attr_type=A_RR; /* Save remedyref */
-+ break;
-+ case C_TK: attr_type=A_NA; /* Save ticket/netname */
-+ break;
- default:
- LG_log(ud_context, LG_SEVERE, "not valid class type\n");
- attr_type=A_END;
-@@ -820,6 +831,7 @@
- /* Only for these types of objects and only if we have collected data
(tr->save != NULL) */
- if( ( (tr->class_type==C_RT)
- || (tr->class_type==C_IN)
-+ || (tr->class_type==C_RA) /* Range object */
- || (tr->class_type==C_I6)
- || (tr->class_type==C_DN))) {
- /* Collect some data for radix tree and NH repository update for deletes*/
-Index: modules/ud/ud_comrol.h
-diff -Nau modules/ud/ud_comrol.h.orig modules/ud/ud_comrol.h
---- modules/ud/ud_comrol.h.orig Thu Jul 3 09:55:49 2003
-+++ modules/ud/ud_comrol.h Tue Dec 9 17:35:09 2003
-@@ -73,7 +73,7 @@
-
"admin_c","tech_c","rev_srv","notify","mnt_by","mnt_lower","mnt_routes","mnt_irt",NULL};
/*C_I6,*/
-
- char *t_in[]={ "mntner","person_role","names","irt",NULL,NULL,
--
"admin_c","tech_c","rev_srv","notify","mnt_by","mnt_lower","mnt_routes","mnt_irt",NULL};
/*C_IN,*/
-+
"admin_c","tech_c","rev_srv","notify","mnt_by","mnt_lower","mnt_routes","mnt_irt","reg_ref",NULL};
/*C_IN,*/
-
- char *t_ir[]={ "mntner","person_role","names",NULL,NULL,NULL,
- "ifaddr","admin_c","tech_c","notify","mnt_by",NULL}; /*C_IR,*/
-@@ -114,6 +114,21 @@
- char *t_it[]={ "mntner","person_role","names",NULL,NULL,NULL,
- "admin_c","tech_c","notify","mnt_by","auth","irt_nfy",NULL};
/*C_IS,*/
-
-+char *t_ri[]={ "mntner","person_role","names",NULL,NULL,NULL,
-+ "mnt_by","as_ref", NULL}; /*C_RI */
-+
-+char *t_pp[]={ "mntner","person_role","names",NULL,NULL,NULL,
-+ "mnt_by","as_ref", "reg_ref", NULL}; /*C_PP */
-+
-+char *t_tk[]={ "mntner","person_role","names",NULL,NULL,NULL,
-+ "mnt_by","reg_ref", NULL}; /*C_TK */
-+
-+char *t_ra[]={ "mntner","person_role","names","irt",NULL,NULL,
-+
"admin_c","tech_c","rev_srv","notify","mnt_by","mnt_lower","mnt_routes","mnt_irt","reg_ref","pop_ref","purp_ref",NULL};
/*C_RA */
-+
-+char *t_pu[]={ "mntner","person_role","names",NULL,NULL,NULL,
-+ "mnt_by", NULL}; /*C_PU */
-+
- /* IMPORTANT !!! */
- /* This stuff should be consistent with DF_classnames.def */
-
-@@ -136,6 +151,11 @@
- t_ps,
- t_is,
- t_it,
-+t_ri,
-+t_pp,
-+t_tk,
-+t_ra,
-+t_pu,
- NULL
- };
-
-Index: modules/ud/ud_core.c
-diff -Nau modules/ud/ud_core.c.orig modules/ud/ud_core.c
---- modules/ud/ud_core.c.orig Thu Jul 3 09:55:49 2003
-+++ modules/ud/ud_core.c Tue Dec 9 17:57:15 2003
-@@ -654,6 +654,10 @@
- /* Determine the attribute type */
- attribute_type = rpsl_get_attr_id(rpsl_attr_get_name(attribute));
- /* Get attribute value .It is already clean since we process the flattened copy of
the object */
-+ if(attribute_type==A_AX || attribute_type==A_RG || /* Never allow dummy for */
-+ attribute_type==A_TK || attribute_type==A_PF || /* reg-id, pop and ticket */
-+ attribute_type==A_UF)
-+ return 1;
- attribute_value = rpsl_attr_get_value(attribute);
-
- query_fmt = DF_get_dummy_query(attribute_type);
-@@ -917,6 +921,22 @@
- get_ref_id(tr, "mntner", "mntner",
attribute_value, condition));
- }
- break;
-+ case UD_AX_AX: /* Update as_ref reference */
-+ g_string_sprintf(tr->query, query_fmt, tr->thread_upd, tr->object_id,
-+ get_ref_id(tr, "aut_num", "aut_num", attribute_value, NULL));
-+ break;
-+ case UD_AX_RG: /* Update reg_ref reference */
-+ g_string_sprintf(tr->query, query_fmt, tr->thread_upd, tr->object_id,
-+ get_ref_id(tr, "reg_id", "reg_id", attribute_value, NULL));
-+ break;
-+ case UD_AX_PP: /* Update pop reference */
-+ g_string_sprintf(tr->query, query_fmt, tr->thread_upd, tr->object_id,
-+ get_ref_id(tr, "pop", "pop", attribute_value, NULL));
-+ break;
-+ case UD_AX_PU: /* Update purpose reference */
-+ g_string_sprintf(tr->query, query_fmt, tr->thread_upd, tr->object_id,
-+ get_ref_id(tr, "purpose", "purpose", attribute_value, NULL));
-+ break;
- case UD_LEAF_:
- g_string_sprintf(tr->query, query_fmt, tr->thread_upd,
tr->object_id, attribute_value);
- break;
-@@ -1144,8 +1164,19 @@
- }
- break;
- case UD_AUX__: /* for AUX tables*/
-- g_string_sprintf(tr->query, query_fmt, tr->thread_ins,
tr->object_id, tr->class_type, attribute_value);
-- if(!IS_DUMMY_ALLOWED(tr->mode))g_string_sprintfa(tr->query, "
AND dummy=0 ");
-+ /* Never create dummys for this attribute */
-+ if(attribute_type==A_AX || attribute_type==A_RG ||
-+ attribute_type==A_TK || attribute_type==A_PF ||
-+ attribute_type==A_UF )
-+ {
-+ g_string_sprintf(tr->query, query_fmt, tr->thread_ins,
tr->object_id,
-+ tr->class_type, attribute_value);
-+ }
-+ else {
-+ g_string_sprintf(tr->query, query_fmt, tr->thread_ins,
tr->object_id,
-+ tr->class_type, attribute_value);
-+ if(!IS_DUMMY_ALLOWED(tr->mode))g_string_sprintfa(tr->query, " AND
dummy=0 ");
-+ }
- break;
- case UD_AX_MO: /* for member_of table*/
- set_name = get_set_name(tr->class_type);
-Index: modules/ud/ud_rx.c
-diff -Nau modules/ud/ud_rx.c.orig modules/ud/ud_rx.c
---- modules/ud/ud_rx.c.orig Thu Jul 3 09:55:49 2003
-+++ modules/ud/ud_rx.c Tue Dec 9 17:58:11 2003
-@@ -44,6 +44,7 @@
- const gchar *attribute_value;
-
- switch(attribute_type){
-+ case A_RA: /* Range object */
- case A_IN:
- case A_RT:
- case A_I6:
-Index: modules/wk/which_keytypes.h
-diff -Nau modules/wk/which_keytypes.h.orig modules/wk/which_keytypes.h
---- modules/wk/which_keytypes.h.orig Thu Jul 3 09:55:56 2003
-+++ modules/wk/which_keytypes.h Tue Dec 9 18:05:54 2003
-@@ -54,6 +54,11 @@
- WK_PEERINGSET, /*+ peering-set name +*/
- WK_RTRSET, /*+ router-set name +*/
- WK_IRT, /*+ irt name +*/
-+ WK_REGID, /*+ registry id / reg-id +*/
-+ WK_POP, /*+ pop +*/
-+ WK_TICKET, /*+ ticket +*/
-+ WK_RANGE, /*+ range +*/
-+ WK_PURPOSE, /*+ purpose +*/
- WK_END
- } WK_Type;
-
-@@ -87,6 +92,11 @@
- "peering_set",
- "rtr_set",
- "irt",
-+ "reg_id",
-+ "pop",
-+ "ticket",
-+ "ipprefix",
-+ "purpose",
- NULL
- }; /* Keytypes[] */
-
Index: Makefile.site.in
diff -Nau Makefile.site.in.orig Makefile.site.in
--- Makefile.site.in.orig Wed Jul 30 10:17:29 2003
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 ripe-dbase.spec
--- openpkg-src/ripe-dbase/ripe-dbase.spec 9 Dec 2003 17:42:54 -0000 1.4
+++ openpkg-src/ripe-dbase/ripe-dbase.spec 11 Dec 2003 16:25:24 -0000 1.5
@@ -38,7 +38,7 @@
Group: Database
License: RIPE NCC
Version: 3.2.0
-Release: 20031209
+Release: 20031211
# list of sources
Source0: ftp://ftp.ripe.net/ripe/dbase/software/ripe-dbase-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7727 -r1.7728 news.txt
--- openpkg-web/news.txt 11 Dec 2003 10:37:09 -0000 1.7727
+++ openpkg-web/news.txt 11 Dec 2003 16:25:22 -0000 1.7728
@@ -1,3 +1,4 @@
+11-Dec-2003: Upgraded package: P<ripe-dbase-3.2.0-20031211>
11-Dec-2003: Upgraded package: P<tar-1.13.91-20031211>
11-Dec-2003: Upgraded package: P<expect-5.39.0-20031211>
11-Dec-2003: Upgraded package: P<libxslt-1.1.1-20031211>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
