omnibus 3.2.2 → 4.0.0.beta.1

data/spec/data/complicated/config/patches/logrotate/logrotate_basedir_override.patch

@@ -1,12 +0,0 @@
---- Makefile  2013-06-10 08:02:36.000000000 -0400
-+++ Makefile  2013-07-01 15:26:41.000000000 -0400
-@@ -90,6 +90,10 @@
-     CFLAGS += -DSTATEFILE=\"$(STATEFILE)\"
- endif
-
-+ifneq ($(BASEDIR),)
-+    BASEDIR = $BASEDIR
-+endif
-+
- BINDIR = $(BASEDIR)/sbin
- MANDIR ?= $(BASEDIR)/man

data/spec/data/complicated/config/patches/ncurses/ncurses-5.9-solaris-xopen_source_extended-detection.patch

@@ -1,11 +0,0 @@
---- configure.after.pkgin.patches	2012-12-17 01:06:16.964187316 +0000
-+++ configure	2012-12-17 01:07:17.046932230 +0000
-@@ -7864,7 +7864,7 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--cf_result=yes
-+cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:7863: result: $cf_result" >&5

data/spec/data/complicated/config/patches/ncurses/ncurses-clang.patch

@@ -1,42 +0,0 @@
-diff -ruNp ncurses-5.9.orig/c++/cursesf.h ncurses-5.9/c++/cursesf.h
---- ncurses-5.9.orig/c++/cursesf.h	2005-08-13 21:08:24.000000000 +0300
-+++ ncurses-5.9/c++/cursesf.h	2011-04-03 18:29:29.000000000 +0300
-@@ -681,7 +681,7 @@ public:
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Fields=FALSE)
--    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
-+    : NCursesForm (&Fields, with_frame, autoDelete_Fields) {
-       if (form)
-	set_user (const_cast<void *>(p_UserData));
-   };
-@@ -694,7 +694,7 @@ public:
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Fields=FALSE)
--    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
-+    : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x,
-		   with_frame, autoDelete_Fields) {
-       if (form)
-	set_user (const_cast<void *>(p_UserData));
-diff -ruNp ncurses-5.9.orig/c++/cursesm.h ncurses-5.9/c++/cursesm.h
---- ncurses-5.9.orig/c++/cursesm.h	2005-08-13 21:10:36.000000000 +0300
-+++ ncurses-5.9/c++/cursesm.h	2011-04-03 18:31:42.000000000 +0300
-@@ -639,7 +639,7 @@ public:
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Items=FALSE)
--    : NCursesMenu (Items, with_frame, autoDelete_Items) {
-+    : NCursesMenu (&Items, with_frame, autoDelete_Items) {
-       if (menu)
-	set_user (const_cast<void *>(p_UserData));
-   };
-@@ -651,7 +651,7 @@ public:
-		   int begin_x = 0,
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE)
--    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
-+    : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) {
-       if (menu)
-	set_user (const_cast<void *>(p_UserData));
-   };

data/spec/data/complicated/config/patches/ncurses/patch-aa

@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.16 2011/02/28 11:02:46 adam Exp $
-
---- misc/run_tic.in.orig	2006-10-28 21:43:30.000000000 +0200
-+++ misc/run_tic.in
-@@ -122,7 +122,7 @@ TICDIR=`echo $TERMINFO | sed -e 's%/shar
- # would generate a lot of confusing error messages if we tried to overwrite it.
- # We explicitly remove its contents rather than the directory itself, in case
- # the directory is actually a symbolic link.
--( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
-+#( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
-
- if test "$ext_funcs" = 1 ; then
- cat <<EOF
-@@ -164,6 +164,9 @@ else
- fi
- fi
-
-+# For NetBSD pkgsrc, don't bother with setting a symbolic link.
-+exit 0
-+
- # Make a symbolic link to provide compatibility with applications that expect
- # to find terminfo under /usr/lib.  That is, we'll _try_ to do that.  Not
- # all systems support symbolic links, and those that do provide a variety

data/spec/data/complicated/config/patches/ncurses/patch-ab

@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.16 2011/02/28 11:02:46 adam Exp $
-
---- mk-1st.awk.orig	2010-08-07 20:42:30.000000000 +0000
-+++ mk-1st.awk
-@@ -396,11 +396,11 @@ END	{
-				end_name = lib_name;
-				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
-				if ( is_ticlib() ) {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
-+					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
-				} else if ( is_termlib() ) {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
-+					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
-				} else {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
-+					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
-				}
-				print  ""
-				print  "install \\"
-@@ -469,7 +469,7 @@ END	{
-			print "mostlyclean::"
-			printf "\t-rm -f $(%s_OBJS)\n", OBJS
-			if ( MODEL == "LIBTOOL" ) {
--				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
-+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
-			}
-		}
-		else if ( found == 2 )
-@@ -478,13 +478,13 @@ END	{
-			print "mostlyclean::"
-			printf "\t-rm -f $(%s_OBJS)\n", OBJS
-			if ( MODEL == "LIBTOOL" ) {
--				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
-+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
-			}
-			print ""
-			print "clean ::"
-			printf "\t-rm -f $(%s_OBJS)\n", OBJS
-			if ( MODEL == "LIBTOOL" ) {
--				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
-+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
-			}
-		}
-	}

data/spec/data/complicated/config/patches/ncurses/patch-ac

@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.18 2011/11/01 14:47:46 hans Exp $
-
---- configure.orig	2011-02-21 01:40:36.000000000 +0000
-+++ configure
-@@ -7096,6 +7096,13 @@ sco*) #(vi
-	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
-	;;
- solaris2.1[0-9]) #(vi
-+	case "$GCC_VERSION" in
-+		4.[67].*)
-+			cf_XOPEN_SOURCE=600
-+			cf_add_cflags=-std=c99
-+			CPPFLAGS="$CPPFLAGS -std=c99"
-+			;;
-+	esac
-	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-	;;
- solaris2.[1-9]) #(vi
-@@ -9640,12 +9647,7 @@ case ".$MANPAGE_RENAMES" in #(vi
- .no) #(vi
-   ;;
- .|.yes)
--  # Debian 'man' program?
--  if test -f /etc/debian_version ; then
--    MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
--  else
-     MANPAGE_RENAMES=no
--  fi
-   ;;
- esac
-
-@@ -18449,7 +18444,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
-
- ### Construct the list of include-directories to be generated
-
--CPPFLAGS="$CPPFLAGS -I. -I../include"
-+CPPFLAGS="-I. -I../include $CPPFLAGS"
- if test "$srcdir" != "."; then
-	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
- fi

data/spec/data/complicated/config/patches/ncurses/patch-ad

@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2011/02/28 11:02:46 adam Exp $
-
---- c++/Makefile.in.orig	2010-11-27 21:45:27.000000000 +0000
-+++ c++/Makefile.in
-@@ -167,7 +167,7 @@ LIB_OBJS = \
-
- ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
-	cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
--		-o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
-+		-o $(LIBNAME) $(LIB_OBJS:.o=.lo) \
-		-rpath $(INSTALL_PREFIX)$(libdir) \
-		$(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)

data/spec/data/complicated/config/patches/ncurses/patch-aix-configure

@@ -1,23 +0,0 @@
---- configure~	2011-03-31 18:35:51 -0500
-+++ configure	2013-05-16 22:50:24 -0500
-@@ -5559,6 +5559,9 @@
-		if test "$GCC" = yes; then
-			CC_SHARED_OPTS=
-			MK_SHARED_LIB='$(CC) -shared'
-+		else
-+			CC_SHARED_OPTS=
-+			MK_SHARED_LIB='$(CC) -qmkshrobj -o $@'
-		fi
-		;;
-	beos*) #(vi
---- mk-1st.awk~	2010-08-07 15:42:30 -0500
-+++ mk-1st.awk	2013-05-16 22:50:24 -0500
-@@ -180,7 +180,7 @@
- function shlib_build(directory) {
-		dst_libs = sprintf("%s/%s", directory, end_name);
-		printf "%s : \\\n", dst_libs
--		printf "\t\t%s \\\n", directory
-+#		printf "\t\t%s \\\n", directory
-		if (subset ~ /^base/ || subset == "ticlib" ) {
-			save_suffix = suffix
-			sub(/^[^.]\./,".",suffix)

data/spec/data/complicated/config/patches/ncurses/patch-cxx_cursesf.h

@@ -1,22 +0,0 @@
-$NetBSD: patch-cxx_cursesf.h,v 1.1 2011/02/28 11:02:46 adam Exp $
-
---- c++/cursesf.h.orig	2011-02-28 09:23:33.000000000 +0000
-+++ c++/cursesf.h
-@@ -677,7 +677,7 @@ protected:
-   }
-
- public:
--  NCursesUserForm (NCursesFormField Fields[],
-+  NCursesUserForm (NCursesFormField *Fields[],
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Fields=FALSE)
-@@ -686,7 +686,7 @@ public:
-	set_user (const_cast<void *>(p_UserData));
-   };
-
--  NCursesUserForm (NCursesFormField Fields[],
-+  NCursesUserForm (NCursesFormField *Fields[],
-		   int nlines,
-		   int ncols,
-		   int begin_y = 0,

data/spec/data/complicated/config/patches/ncurses/patch-cxx_cursesm.h

@@ -1,22 +0,0 @@
-$NetBSD: patch-cxx_cursesm.h,v 1.1 2011/02/28 11:02:46 adam Exp $
-
---- c++/cursesm.h.orig	2011-02-28 09:25:22.000000000 +0000
-+++ c++/cursesm.h
-@@ -635,7 +635,7 @@ protected:
-   }
-
- public:
--  NCursesUserMenu (NCursesMenuItem Items[],
-+  NCursesUserMenu (NCursesMenuItem *Items[],
-		   const T* p_UserData = STATIC_CAST(T*)(0),
-		   bool with_frame=FALSE,
-		   bool autoDelete_Items=FALSE)
-@@ -644,7 +644,7 @@ public:
-	set_user (const_cast<void *>(p_UserData));
-   };
-
--  NCursesUserMenu (NCursesMenuItem Items[],
-+  NCursesUserMenu (NCursesMenuItem *Items[],
-		   int nlines,
-		   int ncols,
-		   int begin_y = 0,

data/spec/data/complicated/config/patches/nrpe/fix_for_runit.patch

@@ -1,64 +0,0 @@
---- ./nrpe-2.13/src/nrpe.c	2011-11-11 10:45:49.000000000 -0800
-+++ ./nrpe-2.13-runit/src/nrpe.c	2012-01-12 17:48:31.511472215 -0800
-@@ -85,6 +85,7 @@
- int     show_version=FALSE;
- int     use_inetd=TRUE;
- int     debug=FALSE;
-+int     stay_in_foreground=FALSE;
-
-
-
-@@ -273,26 +274,9 @@
-		/* handle the connection */
-		handle_connection(0);
-	        }
--
-	/* else daemonize and start listening for requests... */
--	else if(fork()==0){
-+	else if(1){
-
--		/* we're a daemon - set up a new process group */
--		setsid();
--
--		/* close standard file descriptors */
--		close(0);
--		close(1);
--		close(2);
--
--		/* redirect standard descriptors to /dev/null */
--		open("/dev/null",O_RDONLY);
--		open("/dev/null",O_WRONLY);
--		open("/dev/null",O_WRONLY);
--
--		chdir("/");
--		/*umask(0);*/
--
-		/* handle signals */
-		signal(SIGQUIT,sighandler);
-		signal(SIGTERM,sighandler);
-@@ -301,16 +285,6 @@
-		/* log info to syslog facility */
-		syslog(LOG_NOTICE,"Starting up daemon");
-
--		/* write pid file */
--		if(write_pid_file()==ERROR)
--			return STATE_CRITICAL;
--
--		/* drop privileges */
--		drop_privileges(nrpe_user,nrpe_group);
--
--		/* make sure we're not root */
--		check_privileges();
--
-		do{
-
-			/* reset flags */
-@@ -337,9 +311,6 @@
-
-		        }while(sigrestart==TRUE && sigshutdown==FALSE);
-
--		/* remove pid file */
--		remove_pid_file();
--
-		syslog(LOG_NOTICE,"Daemon shutdown\n");
-	        }

data/spec/data/complicated/config/patches/openssl/openssl-1.0.1f-do-not-build-docs.patch

@@ -1,101 +0,0 @@
---- openssl-1.0.1f/Makefile.org.orig	2014-01-08 10:58:40.000000000 -0800
-+++ openssl-1.0.1f/Makefile.org	2014-01-08 11:06:29.000000000 -0800
-@@ -167,7 +167,7 @@
-
- TOP=    .
- ONEDIRS=out tmp
--EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
-+EDIRS=  times bugs util include certs ms shlib mt demos perl sf dep VMS
- WDIRS=  windows
- LIBS=   libcrypto.a libssl.a
- SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -538,7 +538,7 @@
- dist_pem_h:
-	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
-
--install: all install_docs install_sw
-+install: all install_sw
-
- install_sw:
-	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-@@ -603,7 +603,6 @@
-			echo 'OpenSSL shared libraries have been installed in:'; \
-			echo '  $(INSTALLTOP)'; \
-			echo ''; \
--			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
-		fi; \
-	fi
-	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
-@@ -613,72 +612,4 @@
-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
-
--install_html_docs:
--	here="`pwd`"; \
--	for subdir in apps crypto ssl; do \
--		mkdir -p $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \
--		for i in doc/$$subdir/*.pod; do \
--			fn=`basename $$i .pod`; \
--			echo "installing html/$$fn.$(HTMLSUFFIX)"; \
--			cat $$i \
--			| sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \
--			| pod2html --podroot=doc --htmlroot=.. --podpath=apps:crypto:ssl \
--			| sed -r 's/<!DOCTYPE.*//g' \
--			> $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \
--			$(PERL) util/extract-names.pl < $$i | \
--				grep -v $$filecase "^$$fn\$$" | \
--				(cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \
--				 while read n; do \
--					PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \
--				 done); \
--		done; \
--	done
--
--install_docs:
--	@$(PERL) $(TOP)/util/mkdir-p.pl \
--		$(INSTALL_PREFIX)$(MANDIR)/man1 \
--		$(INSTALL_PREFIX)$(MANDIR)/man3 \
--		$(INSTALL_PREFIX)$(MANDIR)/man5 \
--		$(INSTALL_PREFIX)$(MANDIR)/man7
--	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
--	here="`pwd`"; \
--	filecase=; \
--	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
--		filecase=-i; \
--	fi; \
--	set -e; for i in doc/apps/*.pod; do \
--		fn=`basename $$i .pod`; \
--		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
--		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
--		(cd `$(PERL) util/dirname.pl $$i`; \
--		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
--			--release=$(VERSION) `basename $$i`") \
--			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
--		$(PERL) util/extract-names.pl < $$i | \
--			(grep -v $$filecase "^$$fn\$$"; true) | \
--			(grep -v "[	]"; true) | \
--			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
--			 while read n; do \
--				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
--			 done); \
--	done; \
--	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
--		fn=`basename $$i .pod`; \
--		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
--		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
--		(cd `$(PERL) util/dirname.pl $$i`; \
--		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
--			--release=$(VERSION) `basename $$i`") \
--			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
--		$(PERL) util/extract-names.pl < $$i | \
--			(grep -v $$filecase "^$$fn\$$"; true) | \
--			(grep -v "[	]"; true) | \
--			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
--			 while read n; do \
--				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
--			 done); \
--	done
--
- # DO NOT DELETE THIS LINE -- make depend depends on it.

data/spec/data/complicated/config/patches/postgresql/postgresql-9.1.2-configure-ncurses-fix.patch

@@ -1,12 +0,0 @@
-diff -ur postgresql-9.1.2/configure postgresql-9.1.2.fixed/configure
---- postgresql-9.1.2/configure	2011-12-01 13:47:20.000000000 -0800
-+++ postgresql-9.1.2.fixed/configure	2012-04-09 16:10:15.000000000 -0700
-@@ -8330,7 +8330,7 @@
- else	READLINE_ORDER="-ledit -lreadline"
- fi
- for pgac_rllib in $READLINE_ORDER ; do
--  for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-+  for pgac_lib in "" " -lncurses" " -lcurses" ; do
-     LIBS="${pgac_rllib}${pgac_lib} $pgac_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */