moved into main repo for pisi 2.0

2015-06-19 13:37:40 +03:00
parent 9050f3df88
commit 217df81789
37 changed files with 2418 additions and 0 deletions
@@ -0,0 +1,48 @@
+diff -Nuar cups-1.6.1.orig/config.h.in cups-1.6.1/config.h.in
+--- cups-1.6.1.orig/config.h.in	2012-07-16 21:21:43.000000000 +0300
+++ cups-1.6.1/config.h.in	2013-03-13 18:46:13.805434622 +0200
+@@ -127,7 +127,7 @@
+ #define CUPS_SBINDIR	"/usr/sbin"
+ #define CUPS_SERVERBIN	"/usr/lib/cups"
+ #define CUPS_SERVERROOT	"/etc/cups"
+-#define CUPS_STATEDIR	"/var/run/cups"
+#define CUPS_STATEDIR	"/run/cups"
+ 
+ 
+ /*
+diff -Nuar cups-1.6.1.orig/doc/help/security.html cups-1.6.1/doc/help/security.html
+--- cups-1.6.1.orig/doc/help/security.html	2011-04-29 00:20:12.000000000 +0300
+++ cups-1.6.1/doc/help/security.html	2013-03-13 18:45:47.222433880 +0200
+@@ -53,7 +53,7 @@
+ 	<LI>Local certificate authentication passes 128-bit
+ 	"certificates" that identify an authenticated user.
+ 	Certificates are created on-the-fly from random data and
+-	stored in files under <VAR>/var/run/cups/certs</VAR>.
+	stored in files under <VAR>/run/cups/certs</VAR>.
+ 	They have restricted read permissions: root +
+ 	system-group(s) for the root certificate, and lp + lp
+ 	for CGI certificates.
+diff -Nuar cups-1.6.1.orig/scheduler/org.cups.cupsd.plist cups-1.6.1/scheduler/org.cups.cupsd.plist
+--- cups-1.6.1.orig/scheduler/org.cups.cupsd.plist	2011-04-20 21:15:44.000000000 +0300
+++ cups-1.6.1/scheduler/org.cups.cupsd.plist	2013-03-13 18:44:26.286431623 +0200
+@@ -54,7 +54,7 @@
+ 				<key>SockPathMode</key>
+ 				<integer>49663</integer>
+ 				<key>SockPathName</key>
+-				<string>/private/var/run/cupsd</string>
+				<string>/run/cupsd</string>
+ 			</dict>
+ 		</array>
+ 	</dict>
+diff -Nuar cups-1.6.1.orig/xcode/config.h cups-1.6.1/xcode/config.h
+--- cups-1.6.1.orig/xcode/config.h	2012-07-16 21:21:43.000000000 +0300
+++ cups-1.6.1/xcode/config.h	2013-03-13 18:43:13.618429596 +0200
+@@ -100,7 +100,7 @@
+  * Do we have domain socket support, and if so what is the default one?
+  */
+ 
+-#define CUPS_DEFAULT_DOMAINSOCKET "/private/var/run/cupsd"
+#define CUPS_DEFAULT_DOMAINSOCKET "/run/cupsd"
+ 
+ 
+ /*
@@ -0,0 +1,37 @@
+--- cups-config.in~	2014-01-18 13:56:12.423297761 +0100
+++ cups-config.in	2014-01-18 13:56:59.459964275 +0100
+@@ -50,7 +50,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib; then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
+--- config-scripts/cups-directories.m4~	2014-01-18 13:56:23.529964393 +0100
+++ config-scripts/cups-directories.m4	2014-01-18 13:57:40.706630807 +0100
+@@ -103,8 +103,8 @@ dnl Fix "libdir" variable...
+ if test "$libdir" = "\${exec_prefix}/lib"; then
+ 	case "$uname" in
+ 		Linux*)
+-			if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
+-				libdir="$exec_prefix/lib64"
+			if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+				libdir="$exec_prefix/lib"
+ 			fi
+ 			;;
+ 		HP-UX*)
+--- configure~	2014-01-18 13:56:32.346631030 +0100
+++ configure	2014-01-18 13:57:12.076630898 +0100
+@@ -5893,8 +5893,8 @@ fi
+ if test "$libdir" = "\${exec_prefix}/lib"; then
+ 	case "$uname" in
+ 		Linux*)
+-			if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
+-				libdir="$exec_prefix/lib64"
+			if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+				libdir="$exec_prefix/lib"
+ 			fi
+ 			;;
+ 		HP-UX*)
@@ -0,0 +1,26 @@
+Index: cups-1.4.4/config-scripts/cups-compiler.m4
+===================================================================
+--- cups-1.4.4.orig/config-scripts/cups-compiler.m4
+++ cups-1.4.4/config-scripts/cups-compiler.m4
+@@ -30,7 +30,7 @@ dnl For debugging, keep symbols, otherwi
+ if test x$enable_debug = xyes; then
+ 	OPTIM="-g"
+ else
+-	INSTALL_STRIP="-s"
+	INSTALL_STRIP=""
+ fi
+ 
+ dnl Debug printfs can slow things down, so provide a separate option for that
+Index: cups-1.4.4/configure
+===================================================================
+--- cups-1.4.4.orig/configure
+++ cups-1.4.4/configure
+@@ -10978,7 +10978,7 @@ fi
+ if test x$enable_debug = xyes; then
+ 	OPTIM="-g"
+ else
+-	INSTALL_STRIP="-s"
+	INSTALL_STRIP=""
+ fi
+ 
+ if test x$enable_debug_printfs = xyes; then
@@ -0,0 +1,22 @@
+--- config-scripts/cups-network.m4~	2014-01-18 14:05:51.353295869 +0100
+++ config-scripts/cups-network.m4	2014-01-18 14:07:25.179962227 +0100
+@@ -45,7 +45,7 @@ if test x$enable_domainsocket != xno -a
+ 		case "$uname" in
+ 			Darwin*)
+ 				# Darwin and MaxOS X do their own thing...
+-				CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
+				CUPS_DEFAULT_DOMAINSOCKET="/run/cupsd"
+ 				;;
+ 			*)
+ 				# All others use FHS standard...
+--- config-scripts/cups-directories.m4~	2014-01-18 14:05:59.609962507 +0100
+++ config-scripts/cups-directories.m4	2014-01-18 14:07:13.516628933 +0100
+@@ -420,7 +420,7 @@ AC_ARG_WITH(rundir, [  --with-rundir
+ 			;;
+ 		*)
+ 			# All others
+-			CUPS_STATEDIR="$localstatedir/run/cups"
+			CUPS_STATEDIR="/run/cups"
+ 			;;
+ 	esac])
+ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")