cleanup ytoolshed#6

Author: nrh

librange/AUTHORS AUTHORS

@@ -0,0 +1,19 @@
+if WANT_MODRANGE
+	MAYBE = mod_range $(MAYBE)
+endif
+
+#if WANT_PERL
+#	MAYBE = perl
+#endif
+
+# stealing from http://www.gnu.org/prep/standards/html_node/Directory-Variables.html */
+LIBRANGE_CONF = @sysconfdir@/librange.conf
+DEFAULT_SQLITE_DB = @localstatedir@/range.sqlite
+LIBRANGE_FUNCDIR = @libdir@/librange/
+
+SUBDIRS = src plugins $(MAYBE) doc
+EXTRA_DIST = configure attic m4 clients utils
+ACLOCAL_AMFLAGS = -I m4
+LIBRANGE_DATADIR = "/var/range"
+
+

librange/COPYING COPYING

@@ -1,68 +0,0 @@
-18:24 < e> i've successfully built it on RHEL6
-18:24 < e> via multipkg
-18:24 < e> you need libcrange, mod_ranged both installed
-18:24 < e> and then edit /etc/libcrange.conf to be something sane
-18:25 < e> for yaml files, [ebourget@ela4-admin02 ~]$ cat /etc/libcrange.conf
-18:25 < e> loadmodule yamlfile
-18:25 < e> that's it
-18:25 < e> then put *.yaml in /etc/range/
-18:25 < e> yaml files are:
-18:25 < e> [ebourget@ela4-admin02 range]$ cat ela4-zeppelin1.yaml 
-18:25 < e> ALL:
-18:25 < e> - ela4-app0240.prod.linkedin.com
-18:25 < e> - ela4-app0357.prod.linkedin.com
-18:25 < e> CLUSTER:
-18:25 < e> - ela4-app0240.prod.linkedin.com
-18:25 < e> - ela4-app0357.prod.linkedin.com
-18:25 < e> CONFIG: zeppelin-war-PROD-ELA4-0.0.1140-RC4.15145
-18:25 < e> CONTAINER: zeppelin
-18:25 < e> CONTEXTPATH:
-18:25 < e> etc
-18:32 < p> builds fine on osx
-18:32 < p> s/libtoolize/glibtoolize/
-18:33 < p> how different is the yaml/range specification stuff than the rolesdb stuff i'm used to?
-18:35 < m> in terms of parsing?
-18:35 < p> in terms of specification
-18:35 < p> like:
-18:35 < p> ALL:\n- foo4-10.bar.com
-18:36 < p> is that 4..10?
-18:36 < m> depend if you have - or .. as the expansion dealie
-18:36 < m> I think e switched it
-18:36 < p> yeah i saw
-18:36 < m> so - does nothing now
-18:36 < p> heh
-18:36 < p> but .. would, got it
-18:36 < m> but foo4..10.bar.com would be 4..10 yes
-18:36 < m> no enclosing {} necessary
-18:37 < e> - does set diff
-18:37 < p> and i guess i'm confused about the difference between the definitions like ALL: and how i'm used to using 
-           role-names.  is 'ALL' in this case a rolename?
-18:37 < e> (a,b) - b ==> a
-18:37 < m> e: with spaces right
-18:37 < m> yeah
-18:37 < e> uh
-18:37 < e> ALL is a metadata key
-18:37 < e> if you have foo.yaml
-18:37 < e> with ALL: bar
-18:37 < e> then
-18:37 < m> p: so, the *file* represents a cluster (role)
-18:37 < e> %foo:ALL == bar
-18:37 < m> and
-18:37 < m> every cluster/role is actually a dictionary/hash
-18:37 < e> there's only one magic key
-18:38 < e> called CLUSTER
-18:38 < e> where if you just say %foo
-18:38 < e> it means %foo:CLUSTER
-18:38 < e> everything else is just whatever you feel like calling it
-18:38 < m> so from a roles perspective
-18:38 < m> there are two magic clusters, HOSTS and GROUPS
-18:38 < p> ahhh
-18:38 < p> ok
-18:39 < m> and %GROUPS:FOO has a shorthand syntax of @FOO
-18:39 < m> and this is what rolesdb implemented
-18:39 < m> but the actual underlying cluster labels can have multiple definitions of host lists
-18:39 < m> with arbitary names
-18:40 < m> and as e said there's one that's magic: %foo:CLUSTER, and a few that are by convention like :ALL
-18:40 < p> i'll try to distil this into some actual documentation at some point
-18:40 < p> needs QUICKSTART
-

librange/ChangeLog ChangeLog

@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([librange], [1.1], [[email protected]])
-AC_CONFIG_SRCDIR(src/librange.h)
+AC_CONFIG_SRCDIR([src/librange.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_CONFIG_HEADER([src/config.h])
@@ -21,12 +21,28 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 
-perl_default="/usr/bin/perl"
-AC_ARG_ENABLE([perl], AC_HELP_STRING([--enable-perl=PERL],
-                      ["Use this perl binary to build libcrange's perl
-                       functionality.
-                       (Default = /usr/local/bin/perl)"]),
-                       PERL=$enableval,PERL=$perl_default)
+
+# begin perl checking
+perl_default="/usr/local/bin/perl"
+AC_ARG_ENABLE(
+  perl,
+  AC_HELP_STRING([--enable-perl@<:@=PERL@:>@],
+    [Use this perl binary to build perl functionality.  Requires libperl and working PCRE.  (default = /usr/local/bin/perl)]),
+    if test "$enableval" == "yes"; then
+      PERL=$perl_default
+    else
+      PERL=$enableval
+    fi
+)
+AM_CONDITIONAL([WANT_PERL], [test ! -z "$PERL"])
+
+AC_ARG_ENABLE(
+  [mod-range],
+  AC_HELP_STRING([--enable-mod-range],
+    [Build apache module (Default = enabled)]),
+    MOD_RANGE=$enableval)
+AM_CONDITIONAL([WANT_MODRANGE], [test "$MOD_RANGE" == "yes"])
+
 AC_DEFUN([AC_CHECK_PERL],[
 AC_MSG_CHECKING(perl in $PERL)
 if test [ -f "$PERL" ]
@@ -86,10 +102,27 @@ else
 fi
 ])
 
-AC_CHECK_PERL
-AC_CHECK_PCRE
+AC_DEFUN([AC_CHECK_APXS],[
+AC_CHECK_PROGS(APXS,[apxs apxs2],[],[path=$PATH$PATH_SEPARATOR/usr/local/apache$PATH_SEPARATOR/usr/apache])
+if test -z "$APXS"; then
+  AC_MSG_ERROR("apxs not found")
+fi
+])
+
+# always need APR
 AC_CHECK_APR
 
+# optionally check for perl
+if test ! -z "$PERL"; then
+  AC_CHECK_PERL
+  AC_CHECK_PCRE
+fi
+
+# optionally check for apxs
+if test -z "$MOD_RANGE"; then
+  AC_CHECK_APXS
+fi
+
 AC_CHECK_LIB([m], [sin], [], [exit 1])
 AC_CHECK_LIB([pthread], [pthread_create], [], [exit 1])
 AC_CHECK_LIB([z], [zlibVersion], [], [exit 1])
@@ -111,5 +144,5 @@ AC_CONFIG_FILES([Makefile
                  doc/Makefile
                  m4/Makefile
                  src/Makefile
-                 src/functions/Makefile])
+                 plugins/Makefile])
 AC_OUTPUT

librange/INSTALL INSTALL

@@ -1,5 +1,5 @@
-AM_CFLAGS = -g -pg -Wall -DLIBCRANGE_FUNCDIR=\"$(pkglibdir)\" -DLIBCRANGE_CONF=\"/etc/libcrange.conf\" -DDEFAULT_SQLITE_DB=\"/var/range.sqlite\" -DLIBCRANGE_YAML_DIR=\"/var/range/\" -I../src @PCRE_CFLAGS@ @APR_CFLAGS@
-AM_LDFLAGS = -module -L../src -lcrange -lyaml -lsqlite3 @PCRE_LIBS@ @APR_LIBS@
+AM_CFLAGS = -g -pg -Wall -DLIBCRANGE_FUNCDIR=\"$(pkglibdir)\" -DLIBCRANGE_CONF=\"/etc/libcrange.conf\" -DDEFAULT_SQLITE_DB=\"/var/range.sqlite\" -DLIBCRANGE_YAML_DIR=\"/var/range/\" @PCRE_CFLAGS@ @APR_CFLAGS@
+AM_LDFLAGS = -module -lrange -lyaml -lsqlite3 @PCRE_LIBS@ @APR_LIBS@
 
 pkglib_LTLIBRARIES = yst-ip-list.la ip.la nodescf.la yamlfile.la sqlite.la
 
@@ -11,4 +11,3 @@ yst_ip_list_la_SOURCES = yst-ip-list.c netblock.c tinydns_ip.c \
 ip_la_SOURCES = ip.c tinydns_ip.c
 
 
-

Makefile.am

@@ -6,7 +6,7 @@
 #include <apr_strings.h>
 
 #include "set.h"
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 
 const char** functions_provided(libcrange* lr)

librange/NEWS NEWS

@@ -5,7 +5,7 @@
 #include <sqlite3.h>
 
 #include "set.h"
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 
 const char** functions_provided(libcrange* lr)

README

@@ -1,7 +1,7 @@
 #ifndef HOSTS_NETBLOCKS_H
 #define HOSTS_NETBLOCKS_H
 
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 #include "netblock.h"
 

librange/configure.ac configure.ac

@@ -1,4 +1,4 @@
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 #include "tinydns_ip.h"
 

librange/doc/Makefile.am doc/Makefile.am

@@ -1,7 +1,7 @@
 #ifndef NETBLOCK_H
 #define NETBLOCK_H
 
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 #include "tinydns_ip.h"
 

librange/Makefile.am

@@ -7,7 +7,7 @@
 #include <sys/stat.h>
 #include <apr_strings.h>
 #include <apr_tables.h>
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 
 static const char* nodescf_path = "/etc/range";

librange/README

@@ -1,7 +1,7 @@
 #ifndef NODESCF_H
 #define NODESCF_H
 
-#include "libcrange.h"
+#include "librange.h"
 #include "set.h"
 #include "filecache.h"
 

librange/m4/Makefile.am m4/Makefile.am

@@ -6,7 +6,7 @@
 #include <apr_strings.h>
 
 #include "set.h"
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 
 const char** functions_provided(libcrange* lr)

librange/m4/libtool.m4 m4/libtool.m4

@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 
 #include "set.h"
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 char* _join_elements(apr_pool_t* pool, char sep, set* the_set);
 

librange/m4/ltoptions.m4 m4/ltoptions.m4

@@ -9,7 +9,7 @@
 
 #include "range_request.h"
 #include "set.h"
-#include "libcrange.h"
+#include "librange.h"
 #include "tinydns_ip.h"
 
 typedef struct cache_entry

librange/m4/ltsugar.m4 m4/ltsugar.m4

@@ -1,7 +1,7 @@
 #ifndef TINYDNS_IP_H
 #define TINYDNS_IP_H
 
-#include "libcrange.h"
+#include "librange.h"
 
 #define A_RE "^\\+([^:]+):([^:]+):0"
 #define CNAME_RE "^C([^:]+):([^:]+)\\.:0"

librange/m4/ltversion.m4 m4/ltversion.m4

@@ -62,7 +62,7 @@ the key will be composed of all elements set-added together.
 #include <sys/stat.h>
 #include <apr_strings.h>
 #include <apr_tables.h>
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 
 static const char* yaml_path = LIBCRANGE_YAML_DIR;

librange/m4/lt~obsolete.m4 m4/lt~obsolete.m4

@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "set.h"
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 #include "tinydns_ip.h"
 #include "hosts-netblocks.h"

librange/src/functions/Makefile.am plugins/Makefile.am

@@ -1,4 +1,3 @@
-SUBDIRS = functions
 AM_YFLAGS = -d
 AM_CFLAGS = -fPIC -Wall
 bin_PROGRAMS = range
@@ -16,7 +15,7 @@ librange_la_SOURCES = range_parser.y range_scanner.l \
           librange.c ast.c range_compress.c \
           range.c
 
-librange_la_CFLAGS = -Wall -DLIBRANGE_FUNCDIR=\"$(pkglibdir)\" -DLIBRANGE_CONF=\"/etc/range.conf\" -DDEFAULT_SQLITE_DB=\"/var/range.sqlite\" -DLIBRANGE_YAML_DIR=\"/var/range/\" @PERL_CFLAGS@ @PCRE_CFLAGS@ @APR_CFLAGS@
+librange_la_CFLAGS = -Wall @PERL_CFLAGS@ @PCRE_CFLAGS@ @APR_CFLAGS@
 librange_la_LDFLAGS = @PERL_LIBS@ @PCRE_LIBS@ @APR_LIBS@
 
 range_scanner.h:

librange/src/functions/group-mysql.c plugins/group-mysql.c

@@ -7,7 +7,7 @@ Copyrights licensed under the New BSD License. See the accompanying LICENSE file
 #include <stdio.h>
 #include "ast.h"
 #include "range.h"
-#include "libcrange.h"
+#include "librange.h"
 
 rangeast* range_ast_new(apr_pool_t* pool, rangetype type)
 {
@@ -114,7 +114,7 @@ range* range_evaluate(range_request* rr, const rangeast* ast)
             r = range_new(rr);
             return r;
         default:
-            fprintf(stderr, "ERROR IN LIBCRANGE: Corrupted AST\n");
+            fprintf(stderr, "ERROR IN LIBRANGE: Corrupted AST\n");
             abort();
     }
 }

librange/src/functions/group-sqlite.c plugins/group-sqlite.c

@@ -6,7 +6,7 @@ Copyrights licensed under the New BSD License. See the accompanying LICENSE file
 #ifndef AST_H
 #define AST_H
 
-#include "libcrange.h"
+#include "librange.h"
 #include "range.h"
 
 typedef enum {

librange/src/functions/hosts-netblocks.c plugins/hosts-netblocks.c

@@ -1,6 +1,6 @@
 %module Crange
 %{
-#include "libcrange.h"
+#include "librange.h"
 %}
 %include "libcrange.h"
 %inline %{