SOURCES: pipslite-ekpd-permissions.patch (NEW), pipslite-init.patc...

pascalek pascalek at pld-linux.org
Mon Jan 21 19:43:10 CET 2008


Author: pascalek                     Date: Mon Jan 21 18:43:10 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- initial revision

---- Files affected:
SOURCES:
   pipslite-ekpd-permissions.patch (NONE -> 1.1)  (NEW), pipslite-init.patch (NONE -> 1.1)  (NEW), pipslite-services.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/pipslite-ekpd-permissions.patch
diff -u /dev/null SOURCES/pipslite-ekpd-permissions.patch:1.1
--- /dev/null	Mon Jan 21 19:43:10 2008
+++ SOURCES/pipslite-ekpd-permissions.patch	Mon Jan 21 19:43:04 2008
@@ -0,0 +1,27 @@
+diff -Nur pipslite-1.0.2.orig/ekpd/cbtd.c pipslite-1.0.2.chng/ekpd/cbtd.c
+--- pipslite-1.0.2.orig/ekpd/cbtd.c	2007-12-05 09:40:42.000000000 +0100
++++ pipslite-1.0.2.chng/ekpd/cbtd.c	2008-01-21 19:13:37.000000000 +0100
+@@ -83,11 +83,6 @@
+ #ifndef _DEBUG
+ 	int pid;
+ 
+-	if (geteuid () != 0)
+-	{
+-		fprintf (stderr, "must run as root\n");
+-		return 1;
+-	}
+ 	/* shift to daemon process */
+ 	if ((pid = fork ()))
+ 	{
+diff -Nur pipslite-1.0.2.orig/ekpd/cbtd_datatrans.c pipslite-1.0.2.chng/ekpd/cbtd_datatrans.c
+--- pipslite-1.0.2.orig/ekpd/cbtd_datatrans.c	2007-12-05 09:40:42.000000000 +0100
++++ pipslite-1.0.2.chng/ekpd/cbtd_datatrans.c	2008-01-21 19:12:40.000000000 +0100
+@@ -198,7 +198,7 @@
+ 	if (access (path, F_OK) == 0)
+ 		remove(path);
+ 
+-	if (mkfifo (path, 0666))
++	if (mkfifo (path, 0600))
+ 		return -1;
+ 
+ 	if (is_sysflags (p_info, ST_JOB_CANCEL | ST_JOB_CANCEL_NO_D4))

================================================================
Index: SOURCES/pipslite-init.patch
diff -u /dev/null SOURCES/pipslite-init.patch:1.1
--- /dev/null	Mon Jan 21 19:43:10 2008
+++ SOURCES/pipslite-init.patch	Mon Jan 21 19:43:04 2008
@@ -0,0 +1,70 @@
+diff -Nur pipslite-1.0.2.orig/setup/inst-lpr-post.sh pipslite-1.0.2.chng/setup/inst-lpr-post.sh
+--- pipslite-1.0.2.orig/setup/inst-lpr-post.sh	2007-12-05 09:40:42.000000000 +0100
++++ pipslite-1.0.2.chng/setup/inst-lpr-post.sh	2008-01-21 19:16:49.000000000 +0100
+@@ -48,10 +48,6 @@
+ 
+ case "$1" in
+     install)
+-	if [ ! -s $PIPSCONFDIR/pipsrc ]; then
+-	    touch $PIPSCONFDIR/pipsrc
+-	fi
+-	
+ 	if [ ! -s $PIPSCONFDIR/prtOpt.csv ]; then
+ 	    touch $PIPSCONFDIR/prtOpt.csv
+ 	    chmod a+w $PIPSCONFDIR/prtOpt.csv
+@@ -84,11 +80,6 @@
+ 	    echo "Install Message > Backup file is /etc/services.bak."
+ 	fi
+ 	
+-#
+-# rcfile install
+-#
+-	DESTDIR=$DESTDIR $PKGDATADIR/rc.d/inst-rc_d.sh install
+-	
+ 	echo "Install Message > Start /usr/share/$PIPS_BIN_NAME/setup to change setup."
+ 	
+ 	OLDMASK=`umask`
+@@ -120,8 +95,7 @@
+ 	umask $OLDMASK
+ 	
+ # printer reset
+-	DIST=`$PKGDATADIR/rc.d/inst-rc_d.sh checkdist`
+-	$PKGDATADIR/rc.d/ekpd.$DIST restart 2>&1 1>/dev/null
++	/etc/rc.d/init.d/ekpd restart 2>&1 1>/dev/null
+ 	
+ 	CHECKPC=`whereis -b checkpc | sed -e "s/^.*:[[:space:]]*//"`
+ 	if [ -n "$CHECKPC" -a -x "$CHECKPC" ] ; then
+@@ -144,8 +118,6 @@
+ 	if [ -d $DESTDIR/var/spool/lpd/${PRINTER_MODEL_LOW} ]; then
+ 	    rm -rf $DESTDIR/var/spool/lpd/${PRINTER_MODEL_LOW}
+ 	fi
+-	
+-	$PKGDATADIR/rc.d/inst-rc_d.sh deinstall
+ 	;;
+     *)
+ 	echo "Usage: install_post.sh { install | deinstall }" >&2
+diff -Nur pipslite-1.0.2.orig/setup/setup-cups.sh pipslite-1.0.2.chng/setup/setup-cups.sh
+--- pipslite-1.0.2.orig/setup/setup-cups.sh	2007-12-05 09:40:42.000000000 +0100
++++ pipslite-1.0.2.chng/setup/setup-cups.sh	2008-01-21 19:17:28.000000000 +0100
+@@ -147,7 +147,6 @@
+ 
+ 
+ # printer reset
+-DIST=`$RC_D_PATH/inst-rc_d.sh checkdist`
+-$RC_D_PATH/ekpd.$DIST restart 2>&1 1>/dev/null
+++/etc/rc.d/init.d/ekpd restart 2>&1 1>/dev/null
+ 
+ exit 0
+diff -Nur pipslite-1.0.2.orig/setup/setup-lpr.sh pipslite-1.0.2.chng/setup/setup-lpr.sh
+--- pipslite-1.0.2.orig/setup/setup-lpr.sh	2007-12-05 09:40:42.000000000 +0100
++++ pipslite-1.0.2.chng/setup/setup-lpr.sh	2008-01-21 19:17:42.000000000 +0100
+@@ -203,8 +203,7 @@
+ umask $OLDMASK
+ 
+ # printer reset
+-DIST=`$RC_D_PATH/inst-rc_d.sh checkdist`
+-$RC_D_PATH/ekpd.$DIST restart 2>&1 1>/dev/null
+++/etc/rc.d/init.d/ekpd restart 2>&1 1>/dev/null
+ 
+ CHECKPC=`whereis -b checkpc | sed -e "s/^.*:[[:space:]]*//"`
+ if [ -n "$CHECKPC" -a -x "$CHECKPC" ] ; then

================================================================
Index: SOURCES/pipslite-services.patch
diff -u /dev/null SOURCES/pipslite-services.patch:1.1
--- /dev/null	Mon Jan 21 19:43:10 2008
+++ SOURCES/pipslite-services.patch	Mon Jan 21 19:43:05 2008
@@ -0,0 +1,107 @@
+diff -Nur pipslite-1.0.2.orig/setup/inst-cups-post.sh pipslite-1.0.2.chng/setup/inst-cups-post.sh
+--- pipslite-1.0.2.orig/setup/inst-cups-post.sh	2007-12-05 09:40:42.000000000 +0100
++++ pipslite-1.0.2.chng/setup/inst-cups-post.sh	2008-01-21 19:09:55.000000000 +0100
+@@ -45,21 +45,6 @@
+ 
+ case "$1" in
+     install)
+-	KEY=`grep 35586 < /etc/services`
+-	if [ -z "$KEY" ]; then
+-	    if [ -s $ETCDIR/services ]; then
+-		cp $ETCDIR/services $ETCDIR/services.bak
+-	    fi
+-	    cat <<EOF >>$ETCDIR/services
+-# written for $PIPS_BIN_NAME
+-cbtd     35586/tcp
+-# $PIPS_BIN_NAME  end
+-EOF
+-	    
+-	    echo "Install Message > Described entry of $PRINTER_MODEL in services."
+-	    echo "Install Message > Backup file is /etc/services.bak."
+-	fi
+-
+ #
+ # prtOpt.csv install
+ #
+@@ -82,14 +67,6 @@
+ 	;;
+ 
+     deinstall)
+-	if [ -s $DESTDIR/etc/services ]; then
+-	    KEY=`grep "\# written for $PIPS_BIN_NAME" /etc/services`
+-	    if [ -n "$KEY" ]; then
+-		mv $DESTDIR/etc/services $DESTDIR/etc/services.bak
+-		sed -e "/# written for $PIPS_BIN_NAME/,/# $PIPS_BIN_NAME  end/d" < $DESTDIR/etc/services.bak > $DESTDIR/etc/services
+-	    fi
+-	fi
+-
+ 	$PKGDATADIR/rc.d/inst-rc_d.sh deinstall
+ 	;;
+     *)
+diff -Nur pipslite-1.0.2.orig/setup/inst-lpr-post.sh pipslite-1.0.2.chng/setup/inst-lpr-post.sh
+--- pipslite-1.0.2.orig/setup/inst-lpr-post.sh	2007-12-05 09:40:42.000000000 +0100
++++ pipslite-1.0.2.chng/setup/inst-lpr-post.sh	2008-01-21 19:16:49.000000000 +0100
+@@ -84,22 +80,6 @@
+ 	    echo "Install Message > Backup file is ${PRINTCAP}.bak."
+ 	fi
+ 	
+-	
+-	KEY=`grep 35586 < /etc/services`
+-	if [ -z "$KEY" ]; then
+-	    if [ -s $ETCDIR/services ]; then
+-		cp $ETCDIR/services $ETCDIR/services.bak
+-	    fi
+-	    cat <<EOF >>$ETCDIR/services
+-# written for $PIPS_BIN_NAME
+-cbtd     35586/tcp
+-# $PIPS_BIN_NAME  end
+-EOF
+-	    
+-	    echo "Install Message > Described entry of $PIPS_BIN_NAME in services."
+-	    echo "Install Message > Backup file is /etc/services.bak."
+-	fi
+-	
+ #
+ # rcfile install
+ #
+@@ -144,14 +118,6 @@
+ 	    fi
+ 	fi
+ 	
+-	if [ -s $DESTDIR/etc/services ]; then
+-	    KEY=`grep "\# written for $PIPS_BIN_NAME" /etc/services`
+-	    if [ -n "$KEY" ]; then
+-		mv $DESTDIR/etc/services $DESTDIR/etc/services.bak
+-		sed -e "/# written for $PIPS_BIN_NAME/,/# $PIPS_BIN_NAME  end/d" < $DESTDIR/etc/services.bak > $DESTDIR/etc/services
+-	    fi
+-	fi
+-	
+ 	if [ -d $DESTDIR/var/spool/lpd/${PRINTER_MODEL_LOW} ]; then
+ 	    rm -rf $DESTDIR/var/spool/lpd/${PRINTER_MODEL_LOW}
+ 	fi
+diff -Nur pipslite-1.0.2.orig/src/pipsCom.c pipslite-1.0.2.chng/src/pipsCom.c
+--- pipslite-1.0.2.orig/src/pipsCom.c	2007-12-05 09:40:42.000000000 +0100
++++ pipslite-1.0.2.chng/src/pipsCom.c	2008-01-21 19:12:07.000000000 +0100
+@@ -46,7 +46,6 @@
+   int len;
+   struct sockaddr_in address;
+   struct hostent *hostinfo;
+-  struct servent *servinfo;
+ 
+   if (host == NULL)
+       host = "localhost";
+@@ -54,13 +53,10 @@
+   hostinfo = gethostbyname (host);
+   if (!hostinfo) return -1;
+ 
+-  servinfo = getservbyname ("cbtd", "tcp");
+-  if (!servinfo) return -1;
+-
+   sockfd = socket (AF_INET, SOCK_STREAM, 0);
+   address.sin_family = AF_INET;
+   address.sin_addr = *(struct in_addr *)*hostinfo->h_addr_list;
+-  address.sin_port = servinfo->s_port;
++  address.sin_port = htons(35586);
+ 
+   len = sizeof (address);
+   if (connect (sockfd, (struct sockaddr *)&address, len) == -1)
================================================================


More information about the pld-cvs-commit mailing list