summaryrefslogtreecommitdiff
path: root/print/hplip3/files
diff options
context:
space:
mode:
Diffstat (limited to 'print/hplip3/files')
-rw-r--r--print/hplip3/files/hpssd.sh.in31
-rw-r--r--print/hplip3/files/patch-Makefile.am37
-rw-r--r--print/hplip3/files/patch-Makefile.in72
-rw-r--r--print/hplip3/files/patch-base_utils.py53
-rw-r--r--print/hplip3/files/patch-hpssd.py21
-rw-r--r--print/hplip3/files/patch-prnt_hpijs_hpijsfax.cpp11
6 files changed, 0 insertions, 225 deletions
diff --git a/print/hplip3/files/hpssd.sh.in b/print/hplip3/files/hpssd.sh.in
deleted file mode 100644
index 105076f0a135..000000000000
--- a/print/hplip3/files/hpssd.sh.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: hpssd
-# REQUIRE: hpiod
-# BEFORE: cupsd
-# KEYWORD: shutdown
-
-. %%RC_SUBR%%
-
-name=hpssd
-rcvar=${name}_enable
-
-command="%%PREFIX%%/sbin/${name}"
-command_interpreter="%%PREFIX%%/bin/python"
-pidfile="/var/run/${name}.pid"
-hpssd_user=nobody
-command_args=">/dev/null"
-
-start_precmd="hpssd_prestart"
-
-load_rc_config $name
-
-: ${hpssd_enable="NO"}
-
-hpssd_prestart()
-{
- touch ${pidfile}
- chown ${hpssd_user} ${pidfile}
-}
-
-run_rc_command $*
diff --git a/print/hplip3/files/patch-Makefile.am b/print/hplip3/files/patch-Makefile.am
deleted file mode 100644
index beb9769cde6c..000000000000
--- a/print/hplip3/files/patch-Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.am.orig Fri Sep 21 15:36:07 2007
-+++ Makefile.am Tue Oct 9 19:31:35 2007
-@@ -45,7 +45,7 @@
- www243dir = $(docdir)/install/step4/suse
- dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
- www251dir = $(docdir)/install/manual
--dist_www251_DATA = $(wwwsrc)/install/manual/*
-+dist_www251_DATA = $(wwwsrc)/install/manual/*.html
- www252dir = $(docdir)/install/manual/distros
- dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
- www261dir = $(docdir)/install/install
-@@ -53,13 +53,13 @@
- www3dir = $(docdir)/styles
- dist_www3_DATA = $(wwwsrc)/styles/*
- www4dir = $(docdir)/images
--dist_www4_DATA = $(wwwsrc)/images/*
-+dist_www4_DATA = $(wwwsrc)/images/*.png
- www5dir = $(docdir)/supported_devices
- dist_www5_DATA = $(wwwsrc)/supported_devices/*
- www6dir = $(docdir)/tech_docs
--dist_www6_DATA = $(wwwsrc)/tech_docs/*
-+dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
- www61dir = $(docdir)/tech_docs/man_pages
--dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
-+dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
- www7dir = $(docdir)/troubleshooting
- dist_www7_DATA = $(wwwsrc)/troubleshooting/*
- endif
-@@ -131,7 +131,7 @@
- dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
- dist_models_DATA = data/models/models.dat
- if GUI_BUILD
--dist_images_DATA = data/images/*
-+dist_images_DATA = data/images/*.png
- endif
- dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
- data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
diff --git a/print/hplip3/files/patch-Makefile.in b/print/hplip3/files/patch-Makefile.in
deleted file mode 100644
index 0f340db071ce..000000000000
--- a/print/hplip3/files/patch-Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
---- Makefile.in.orig Fri Sep 28 19:33:08 2007
-+++ Makefile.in Tue Oct 9 21:10:19 2007
-@@ -671,7 +671,7 @@
- dist_faxppdDATA_INSTALL = $(INSTALL_DATA)
- am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc
- dist_hplipDATA_INSTALL = $(INSTALL_DATA)
--am__dist_images_DATA_DIST = data/images/*
-+am__dist_images_DATA_DIST = data/images/*.png
- dist_imagesDATA_INSTALL = $(INSTALL_DATA)
- am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \
- data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \
-@@ -1610,7 +1610,7 @@
- dist_www242DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/*
- dist_www243DATA_INSTALL = $(INSTALL_DATA)
--am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/*
-+am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/*.html
- dist_www251DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/*
- dist_www252DATA_INSTALL = $(INSTALL_DATA)
-@@ -1618,13 +1618,13 @@
- dist_www261DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*
- dist_www3DATA_INSTALL = $(INSTALL_DATA)
--am__dist_www4_DATA_DIST = $(wwwsrc)/images/*
-+am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png
- dist_www4DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www5_DATA_DIST = $(wwwsrc)/supported_devices/*
- dist_www5DATA_INSTALL = $(INSTALL_DATA)
--am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/*
-+am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/*.html
- dist_www6DATA_INSTALL = $(INSTALL_DATA)
--am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/*
-+am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/*.html
- dist_www61DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/*
- dist_www7DATA_INSTALL = $(INSTALL_DATA)
-@@ -1840,7 +1840,7 @@
- @DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse
- @DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
- @DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual
--@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/*
-+@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/*.html
- @DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros
- @DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
- @DOC_BUILD_TRUE@www261dir = $(docdir)/install/install
-@@ -1848,13 +1848,13 @@
- @DOC_BUILD_TRUE@www3dir = $(docdir)/styles
- @DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/*
- @DOC_BUILD_TRUE@www4dir = $(docdir)/images
--@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/*
-+@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/*.png
- @DOC_BUILD_TRUE@www5dir = $(docdir)/supported_devices
- @DOC_BUILD_TRUE@dist_www5_DATA = $(wwwsrc)/supported_devices/*
- @DOC_BUILD_TRUE@www6dir = $(docdir)/tech_docs
--@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/*
-+@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
- @DOC_BUILD_TRUE@www61dir = $(docdir)/tech_docs/man_pages
--@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
-+@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
- @DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting
- @DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/*
- @HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc
-@@ -1904,7 +1904,7 @@
- @HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization
- @HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
- @HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat
--@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/*
-+@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/*.png
- @HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
- @HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
- @HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \
diff --git a/print/hplip3/files/patch-base_utils.py b/print/hplip3/files/patch-base_utils.py
deleted file mode 100644
index 92d4757c8cee..000000000000
--- a/print/hplip3/files/patch-base_utils.py
+++ /dev/null
@@ -1,53 +0,0 @@
---- base/utils.py.orig Wed Oct 10 00:23:07 2007
-+++ base/utils.py Wed Oct 10 00:27:04 2007
-@@ -54,6 +54,50 @@
-
- return callable
-
-+# For pidfile locking (must be "static" and global to the whole app)
-+prv_pidfile = None
-+prv_pidfile_name = ""
-+
-+def get_pidfile_lock (a_pidfile_name=""):
-+ """ Call this to either lock the pidfile, or to update it after a fork()
-+ Credit: Henrique M. Holschuh <hmh@debian.org>
-+ """
-+ global prv_pidfile
-+ global prv_pidfile_name
-+ if prv_pidfile_name == "":
-+ try:
-+ prv_pidfile_name = a_pidfile_name
-+ prv_pidfile = os.fdopen(os.open(prv_pidfile_name, os.O_RDWR | os.O_CREAT, 0644), 'r+')
-+ fcntl.fcntl(prv_pidfile.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
-+ while 1:
-+ try:
-+ fcntl.flock(prv_pidfile.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
-+ except (OSError, IOError), e:
-+ if e.errno == errno.EINTR:
-+ continue
-+ elif e.errno == errno.EWOULDBLOCK:
-+ try:
-+ prv_pidfile.seek(0)
-+ otherpid = int(prv_pidfile.readline(), 10)
-+ sys.stderr.write ("can't lock %s, running daemon's pid may be %d\n" % (prv_pidfile_name, otherpid))
-+ except (OSError, IOError), e:
-+ sys.stderr.write ("error reading pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror))
-+
-+ sys.exit(1)
-+ sys.stderr.write ("can't lock %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror))
-+ sys.exit(1)
-+ break
-+ except (OSError, IOError), e:
-+ sys.stderr.write ("can't open pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror))
-+ sys.exit(1)
-+ try:
-+ prv_pidfile.seek(0)
-+ prv_pidfile.write("%d\n" % (os.getpid()))
-+ prv_pidfile.flush()
-+ prv_pidfile.truncate()
-+ except (OSError, IOError), e:
-+ log.error("can't update pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror))
-+
- def daemonize (stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
- """
- Credit: Jürgen Hermann, Andy Gimblett, and Noah Spurrier
diff --git a/print/hplip3/files/patch-hpssd.py b/print/hplip3/files/patch-hpssd.py
deleted file mode 100644
index f3e7a9c8b22e..000000000000
--- a/print/hplip3/files/patch-hpssd.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- hpssd.py Fri Oct 12 19:42:15 2007
-+++ /usr/local/sbin/hpssd Fri Oct 12 23:59:31 2007
-@@ -664,6 +664,10 @@
- if prop.daemonize:
- utils.daemonize()
-
-+ # Lock pidfile before we muck around with system state
-+ # Patch by Henrique M. Holschuh <hmh@debian.org>
-+ utils.get_pidfile_lock(os.path.join(sys_cfg.dirs.run, 'hpssd.pid'))
-+
- # hpssd server dispatcher object
- try:
- server = hpssd_server(prop.hpssd_host, prop.hpssd_port)
-@@ -688,6 +692,7 @@
-
- log.debug("Cleaning up...")
- finally:
-+ os.remove(os.path.join(sys_cfg.dirs.run, 'hpssd.pid'))
- server.close()
- return 0
-
diff --git a/print/hplip3/files/patch-prnt_hpijs_hpijsfax.cpp b/print/hplip3/files/patch-prnt_hpijs_hpijsfax.cpp
deleted file mode 100644
index 3f0d49e84a3a..000000000000
--- a/print/hplip3/files/patch-prnt_hpijs_hpijsfax.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- prnt/hpijs/hpijsfax.cpp.orig Sat Oct 6 11:33:52 2007
-+++ prnt/hpijs/hpijsfax.cpp Sun Oct 7 15:06:23 2007
-@@ -295,7 +295,7 @@
-
- memset (&tv, 0, sizeof (tv));
- gettimeofday (&tv, NULL);
-- cur_time = localtime (&tv.tv_sec);
-+ cur_time = localtime((const time_t *)&tv.tv_sec);
- memset (hpFileName, 0, 256);
- sprintf (hpFileName, "%s/hplipfax%d%d%d%d%d%d.g3", getenv ("TMPDIR"),
- cur_time->tm_year+1900, cur_time->tm_mon+1, cur_time->tm_mday,
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-05 00:10:37 +0000