Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yazıcı için paketler

Browse Source
This commit is contained in:
alihanozturk
2016-01-09 23:55:25 +02:00
parent 83b09584be
commit 858643879e
76 changed files with 11967 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/printer/cups/actions.py
+4 -2
View File
@@ -17,7 +17,7 @@ def setup():
autotools.aclocal("-I config-scripts")
autotools.autoconf("-I config-scripts")
options = '--with-cups-user=lp \
options = '--with-cups-user=daemon \
--with-cups-group=lp \
--with-system-groups=lpadmin \
--with-docdir=/usr/share/cups/html \
@@ -40,6 +40,7 @@ def setup():
--enable-browsing \
--enable-threads \
--enable-raw-printing \
--enable-avahi \
--disable-gnutls \
--disable-launchd \
--without-rcdir \
@@ -55,6 +56,7 @@ def setup():
if get.buildTYPE() == "emul32":
options += ' \
--enable-libusb=no \
--disable-avahi \
--disable-dnssd \
--disable-gssapi \
--disable-dbus \
@@ -80,7 +82,7 @@ def install():
pisitools.removeDir("/usr/serverbin32")
# remove files now part of cups-filters
pisitools.remove("/usr/share/cups/data/testprint")
#pisitools.remove("/usr/share/cups/data/testprint")
pisitools.removeDir("/usr/share/cups/banners")
pisitools.dodir("/usr/share/cups/banners")
return
hardware/printer/cups/files/archlinux/cups-1.6.0-fix-install-perms.patch
+25
View File
@@ -0,0 +1,25 @@
Index: Makedefs.in
===================================================================
--- Makedefs.in (Revision 10520)
+++ Makedefs.in (Arbeitskopie)
@@ -40,14 +40,14 @@
# Installation programs...
#
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA = $(INSTALL) -c -m 444
+INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_DIR = $(INSTALL) -d
-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444
-INSTALL_SCRIPT = $(INSTALL) -c -m 555
+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_MAN = $(INSTALL) -c -m 644
+INSTALL_SCRIPT = $(INSTALL) -c -m 755
#
# Default user, group, and system groups for the scheduler...
hardware/printer/cups/files/fedora/cups-hp-deviceid-oid.patch
+22
View File
@@ -0,0 +1,22 @@
diff -up cups-1.5b1/backend/snmp.c.hp-deviceid-oid cups-1.5b1/backend/snmp.c
--- cups-1.5b1/backend/snmp.c.hp-deviceid-oid 2011-05-20 05:49:49.000000000 +0200
+++ cups-1.5b1/backend/snmp.c 2011-05-24 17:24:48.000000000 +0200
@@ -187,6 +187,7 @@ static const int UriOID[] = { CUPS_OID_p
static const int LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
static cups_array_t *DeviceURIs = NULL;
static int HostNameLookups = 0;
@@ -1006,6 +1007,9 @@ read_snmp_response(int fd) /* I - SNMP
_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
packet.community, CUPS_ASN1_GET_REQUEST,
DEVICE_PRODUCT, XeroxProductOID);
+ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ packet.community, CUPS_ASN1_GET_REQUEST,
+ DEVICE_ID, HPDeviceIdOID);
break;
case DEVICE_DESCRIPTION :
hardware/printer/cups/files/fedora/cups-logrotate.patch
+63
View File
@@ -0,0 +1,63 @@
diff -up cups-2.1b1/scheduler/log.c.logrotate cups-2.1b1/scheduler/log.c
--- cups-2.1b1/scheduler/log.c.logrotate 2015-06-04 20:00:31.000000000 +0200
+++ cups-2.1b1/scheduler/log.c 2015-06-29 13:25:09.623350218 +0200
@@ -26,6 +26,9 @@
# include <systemd/sd-journal.h>
#endif /* HAVE_ASL_H */
#include <syslog.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
/*
@@ -135,12 +138,10 @@ cupsdCheckLogFile(cups_file_t **lf, /* I
}
/*
- * Format the filename as needed...
+ * Format the filename...
*/
- if (!*lf ||
- (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
- MaxLogSize > 0))
+ if (strncmp(logname, "/dev/", 5))
{
/*
* Handle format strings...
@@ -254,6 +255,34 @@ cupsdCheckLogFile(cups_file_t **lf, /* I
/*
* Change ownership and permissions of non-device logs...
*/
+
+ fchown(cupsFileNumber(*lf), RunUser, Group);
+ fchmod(cupsFileNumber(*lf), LogFilePerm);
+ }
+ }
+
+ /*
+ * Has someone else (i.e. logrotate) already rotated the log for us?
+ */
+ else if (strncmp(filename, "/dev/", 5))
+ {
+ struct stat st;
+ if (stat(filename, &st) || st.st_size == 0)
+ {
+ /* File is either missing or has zero size. */
+
+ cupsFileClose(*lf);
+ if ((*lf = cupsFileOpen(filename, "a")) == NULL)
+ {
+ syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename,
+ strerror(errno));
+
+ return (0);
+ }
+
+ /*
+ * Change ownership and permissions of non-device logs...
+ */
fchown(cupsFileNumber(*lf), RunUser, Group);
fchmod(cupsFileNumber(*lf), LogFilePerm);
hardware/printer/cups/files/pld-linux/cups-avahi-no-threaded.patch
+1 -1
View File
@@ -1018,4 +1018,4 @@ diff -up cups-2.0rc1/scheduler/timeout.c.avahi-no-threaded cups-2.0rc1/scheduler
+
+/*
+ * End of "$Id$".
+ */
+ */
hardware/printer/cups/pspec.xml
+22 -8
View File
@@ -12,17 +12,20 @@
<IsA>service</IsA>
<Summary>Common Unix Printing System</Summary>
<Description>cups provides a portable printing layer for *nix-based operating systems.</Description>
<Archive sha1sum="3de556237dcb7c9f3df0eb853a53cb93e1879a8f" type="tarbz2">http://www.cups.org/software/2.0.3/cups-2.0.3-source.tar.bz2</Archive>
<!-- <Archive sha1sum="062beea95c6f8dda0a5e7eed51604e22806ffad3" type="tar" target="cups-1.6.4">http://source.pisilinux.org/1.0/cups-tr.tar</Archive> -->
<Archive sha1sum="7b5bcd0da7a11185ab01f5ab5cd8d1168c7c8b3f" type="tarbz2">http://www.cups.org/software/2.1.2/cups-2.1.2-source.tar.bz2</Archive>
<Archive sha1sum="062beea95c6f8dda0a5e7eed51604e22806ffad3" type="tar" target="cups-2.1.2">http://source.pisilinux.org/1.0/cups-tr.tar</Archive> -->
<BuildDependencies>
<Dependency>acl-devel</Dependency>
<Dependency>pam-devel</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>python-devel</Dependency>
<Dependency>libusb-devel</Dependency>
<Dependency>libgcc</Dependency>
<!--<Dependency>avahi-devel</Dependency>--><!--not needed? -->
<!--<Dependency>cups-filters</Dependency>--><!--çember ? -->
<Dependency>avahi-libs</Dependency>
<Dependency>avahi-devel</Dependency><!--not needed? -->
<!--<Dependency>cups-filters-devel</Dependency>--><!--çember ? -->
<Dependency>mit-kerberos</Dependency>
<Dependency>libpaper-devel</Dependency>
</BuildDependencies>
@@ -32,6 +35,7 @@
<Patch level="1">archlinux/cups-no-gzip-man.patch</Patch>
<Patch level="1">archlinux/cups-1.6.2-statedir.patch</Patch>
<Patch level="1">archlinux/cups-no-gcrypt.patch</Patch>
<Patch level="0">archlinux/cups-1.6.0-fix-install-perms.patch</Patch>
<!-- Debian patches -->
@@ -40,10 +44,12 @@
<Patch level="1">fedora/cups-enum-all.patch</Patch>
<Patch level="1">fedora/cups-final-content-type.patch</Patch>
<Patch level="1">fedora/cups-res_init.patch</Patch>
<Patch level="1">fedora/cups-hp-deviceid-oid.patch</Patch>
<Patch level="1">fedora/cups-logrotate.patch</Patch>
<!-- Gentoo patches -->
<Patch>gentoo/cups-1.6.0-fix-install-perms.patch</Patch>
<Patch>gentoo/cups-2.0.1-rename-systemd-service-files.patch</Patch>
<!-- <Patch>gentoo/cups-1.6.0-fix-install-perms.patch</Patch> -->
<Patch >gentoo/cups-2.0.1-rename-systemd-service-files.patch</Patch>
<!--<Patch>gentoo/cups-2.0.1-fix-linkage-to-gnutls.patch</Patch>
<Patch>gentoo/cups-2.0.1-fix-compilation.patch</Patch>-->
@@ -54,7 +60,7 @@
<!-- Pld-linux patches -->
<Patch>pld-linux/cups-avahi-address.patch</Patch>
<!--<Patch>pld-linux/cups-avahi-no-threaded.patch</Patch>-->
<!-- <Patch>pld-linux/cups-avahi-no-threaded.patch</Patch> -->
</Patches>
</Source>
@@ -69,7 +75,8 @@
<Dependency>libusb</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpaper</Dependency>
<!--<Dependency>avahi-libs</Dependency>-->
<Dependency>avahi</Dependency>
<Dependency>avahi-libs</Dependency>
<Dependency>mit-kerberos</Dependency>
</RuntimeDependencies>
<Files>
@@ -143,6 +150,13 @@
</Package>
<History>
<Update release="15">
<Date>2016-01-09</Date>
<Version>2.1.2</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="14">
<Date>2015-06-10</Date>
<Version>2.0.3</Version>