Page MenuHomeSolus
Files F10986870

D809.id1781.diff
No OneTemporary
Actions

D809.id1781.diff
View Options

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -74,11 +74,21 @@
libcups.so.2:_cups_strlcpy
libcups.so.2:_cups_strncasecmp
libcups.so.2:_httpAddrSetPort
+libcups.so.2:_httpCreateCredentials
libcups.so.2:_httpDecodeURI
libcups.so.2:_httpDisconnect
libcups.so.2:_httpEncodeURI
+libcups.so.2:_httpFreeCredentials
libcups.so.2:_httpResolveURI
libcups.so.2:_httpStatus
+libcups.so.2:_httpTLSInitialize
+libcups.so.2:_httpTLSPending
+libcups.so.2:_httpTLSRead
+libcups.so.2:_httpTLSSetCredentials
+libcups.so.2:_httpTLSSetOptions
+libcups.so.2:_httpTLSStart
+libcups.so.2:_httpTLSStop
+libcups.so.2:_httpTLSWrite
libcups.so.2:_httpUpdate
libcups.so.2:_httpWait
libcups.so.2:_ippFindOption
@@ -113,6 +123,7 @@
libcups.so.2:_pwgMediaTypeForType
libcups.so.2:_pwgPageSizeForMedia
libcups.so.2:cupsAddDest
+libcups.so.2:cupsAddIntegerOption
libcups.so.2:cupsAddOption
libcups.so.2:cupsAdminCreateWindowsPPD
libcups.so.2:cupsAdminExportSamba
@@ -220,6 +231,7 @@
libcups.so.2:cupsGetDevices
libcups.so.2:cupsGetFd
libcups.so.2:cupsGetFile
+libcups.so.2:cupsGetIntegerOption
libcups.so.2:cupsGetJobs
libcups.so.2:cupsGetJobs2
libcups.so.2:cupsGetNamedDest
@@ -243,6 +255,7 @@
libcups.so.2:cupsLocalizeDestMedia
libcups.so.2:cupsLocalizeDestOption
libcups.so.2:cupsLocalizeDestValue
+libcups.so.2:cupsMakeServerCredentials
libcups.so.2:cupsMarkOptions
libcups.so.2:cupsNotifySubject
libcups.so.2:cupsNotifyText
@@ -269,6 +282,7 @@
libcups.so.2:cupsSetPasswordCB2
libcups.so.2:cupsSetServer
libcups.so.2:cupsSetServerCertCB
+libcups.so.2:cupsSetServerCredentials
libcups.so.2:cupsSetUser
libcups.so.2:cupsSetUserAgent
libcups.so.2:cupsSideChannelDoRequest
diff --git a/abi_symbols32 b/abi_symbols32
--- a/abi_symbols32
+++ b/abi_symbols32
@@ -113,6 +113,7 @@
libcups.so.2:_pwgMediaTypeForType
libcups.so.2:_pwgPageSizeForMedia
libcups.so.2:cupsAddDest
+libcups.so.2:cupsAddIntegerOption
libcups.so.2:cupsAddOption
libcups.so.2:cupsAdminCreateWindowsPPD
libcups.so.2:cupsAdminExportSamba
@@ -220,6 +221,7 @@
libcups.so.2:cupsGetDevices
libcups.so.2:cupsGetFd
libcups.so.2:cupsGetFile
+libcups.so.2:cupsGetIntegerOption
libcups.so.2:cupsGetJobs
libcups.so.2:cupsGetJobs2
libcups.so.2:cupsGetNamedDest
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -4,10 +4,12 @@
libc.so.6
libdbus-1.so.3
libgcc_s.so.1
+libgnutls.so.30
libm.so.6
libpam.so.0
libpaper.so.1
libpthread.so.0
libstdc++.so.6
libsystemd.so.0
+libusb-1.0.so.0
libz.so.1
diff --git a/actions.py b/actions.py
deleted file mode 100644
--- a/actions.py
+++ /dev/null
@@ -1,49 +0,0 @@
-
-#!/usr/bin/python
-
-
-from pisi.actionsapi import shelltools, get, autotools, pisitools
-import os
-import shutil
-
-def setup():
- libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib"
- autotools.aclocal("-I config-scripts")
- extOpts = ""
- if get.buildTYPE() == "emul32":
- extOpts = "--disable-avahi --disable-dnssd --disable-systemd"
- autotools.configure("--prefix=/usr \
- --libdir=%s \
- --without-rcdir \
- --with-docdir=/usr/share/cups/doc \
- --with-system-groups=lpadmin \
- --enable-openssl \
- --enable-systemd \
- --enable-acl \
- --enable-dbus \
- --enable-libpaper %s" % (libdir, extOpts))
-
-def build():
- autotools.make()
-
-def install():
- idir = get.installDIR()
- # Force to subdirectory so we dont trash 64-bit installs
- if get.buildTYPE() == "emul32":
- idir += "/derpmcderp"
-
- autotools.rawInstall ("BUILDROOT=%s" % idir)
-
- if get.buildTYPE() == "emul32":
- pisitools.dodir("/usr")
- shelltools.system("mv \"%s/usr/lib32\" \"%s/usr/.\"" % (idir, get.installDIR()))
- shutil.rmtree(idir)
- return
-
- pisitools.dodir("/usr/lib/systemd/system/printer.target.wants")
- pisitools.dodir("/usr/lib/systemd/system/sockets.target.wants")
- pisitools.dodir("/usr/lib/systemd/system/multi-user.target.wants")
-
- pisitools.dosym("/usr/lib/systemd/system/org.cups.cupsd.service", "/usr/lib/systemd/system/printer.target.wants/org.cups.cupsd.service")
- pisitools.dosym("/usr/lib/systemd/system/org.cups.cupsd.socket", "/usr/lib/systemd/system/sockets.target.wants/org.cups.cupsd.socket")
- pisitools.dosym("/usr/lib/systemd/system/org.cups.cupsd.path", "/usr/lib/systemd/system/multi-user.target.wants/org.cups.cupsd.path")
diff --git a/comar/package.py b/comar/package.py
deleted file mode 100644
--- a/comar/package.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/python
-
-import os, re
-import commands
-
-ID = 19
-NAME = "lpadmin"
-
-
-OUR_ID = 9
-OUR_NAME = "lp"
-OUR_DESC = "Print Service User"
-
-
-def is_group_empty(group):
- out = commands.getoutput("groupmems -l -g %s" % group)
- if len(out.strip()) == 0:
- return True
- return False
-
-def postInstall(fromVersion, fromRelease, toVersion, toRelease):
- try:
- os.system("groupadd -g %d %s" % (ID, NAME))
- except:
- pass
- try:
- os.system ("groupadd -g %d %s" % (OUR_ID, OUR_NAME))
- os.system ("useradd -m -d /var/spool/cups -r -s /bin/false -u %d -g %d %s -c \"%s\"" % (OUR_ID, OUR_ID, OUR_NAME, OUR_DESC))
- if os.path.exists("/var/spool/cups"):
- os.system("chown -R %s:%s /var/spool/cups" % (ID, ID))
- except:
- pass
-
-def postRemove():
- empty = is_group_empty("lpadmin")
-
- if (empty):
- try:
- os.system("groupdel %s" % NAME)
- except:
- pass
- try:
- os.system ("userdel %s" % OUR_NAME)
- os.system ("groupdel %s" % OUR_NAME)
- except:
- pass
diff --git a/component.xml b/component.xml
deleted file mode 100644
--- a/component.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<PISI>
- <Name>desktop.core</Name>
-</PISI>
diff --git a/files/config b/files/config
deleted file mode 100644
--- a/files/config
+++ /dev/null
@@ -1,6 +0,0 @@
-ServerName /var/run/cups/cups.sock
-Browsing On
-BrowseOrder allow,deny
-BrowseRemoteProtocols
-BrowseAddress @LOCAL
-BrowseLocalProtocols CUPS dnssd
diff --git a/files/cups-0755.patch b/files/cups-0755.patch
new file mode 100644
--- /dev/null
+++ b/files/cups-0755.patch
@@ -0,0 +1,22 @@
+diff -up cups-2.2.4/Makedefs.in.0755 cups-2.2.4/Makedefs.in
+--- cups-2.2.4/Makedefs.in.0755 2017-06-30 20:39:59.411493947 +0200
++++ cups-2.2.4/Makedefs.in 2017-06-30 20:43:29.553609350 +0200
+@@ -38,14 +38,14 @@ SHELL = /bin/sh
+ # Installation programs...
+ #
+
+-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+ INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_DATA = $(INSTALL) -c -m 444
+ INSTALL_DIR = $(INSTALL) -d
+-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_MAN = $(INSTALL) -c -m 444
+-INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
++INSTALL_SCRIPT = $(INSTALL) -c -m 755
+
+ #
+ # Default user, group, and system groups for the scheduler...
+
diff --git a/files/cups-1.6.0-fix-install-perms.patch b/files/cups-1.6.0-fix-install-perms.patch
deleted file mode 100644
--- a/files/cups-1.6.0-fix-install-perms.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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...
diff --git a/files/cups-multilib.patch b/files/cups-multilib.patch
new file mode 100644
--- /dev/null
+++ b/files/cups-multilib.patch
@@ -0,0 +1,17 @@
+diff -up cups-1.5b1/cups-config.in.multilib cups-1.5b1/cups-config.in
+--- cups-1.5b1/cups-config.in.multilib 2010-06-16 02:48:25.000000000 +0200
++++ cups-1.5b1/cups-config.in 2011-05-23 17:33:31.000000000 +0200
+@@ -22,8 +22,10 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
+-imagelibdir=@libdir@
++# Fetch libdir from gnutls's pkg-config script. This is a bit
++# of a cheat, but the cups-devel package requires gnutls-devel anyway.
++libdir=`pkg-config --variable=libdir gnutls`
++imagelibdir=`pkg-config --variable=libdir gnutls`
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+
diff --git a/files/cups-no-export-ssllibs.patch b/files/cups-no-export-ssllibs.patch
new file mode 100644
--- /dev/null
+++ b/files/cups-no-export-ssllibs.patch
@@ -0,0 +1,11 @@
+diff -up cups-2.2b2/config-scripts/cups-ssl.m4.no-export-ssllibs cups-2.2b2/config-scripts/cups-ssl.m4
+--- cups-2.2b2/config-scripts/cups-ssl.m4.no-export-ssllibs 2016-06-27 15:06:22.299980753 +0200
++++ cups-2.2b2/config-scripts/cups-ssl.m4 2016-06-27 15:08:00.953154042 +0200
+@@ -102,5 +102,5 @@ AC_SUBST(IPPALIASES)
+ AC_SUBST(SSLFLAGS)
+ AC_SUBST(SSLLIBS)
+
+-EXPORT_SSLLIBS="$SSLLIBS"
++EXPORT_SSLLIBS=""
+ AC_SUBST(EXPORT_SSLLIBS)
+
diff --git a/files/cups-no-gcry.patch b/files/cups-no-gcry.patch
new file mode 100644
--- /dev/null
+++ b/files/cups-no-gcry.patch
@@ -0,0 +1,13 @@
+diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4
+--- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry 2014-09-12 15:41:23.324760213 +0200
++++ cups-2.0rc1/config-scripts/cups-ssl.m4 2014-09-12 15:43:13.124203363 +0200
+@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then
+ dnl Then look for GNU TLS...
+ if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
+ AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
+- AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
+ if $PKGCONFIG --exists gnutls; then
+ have_ssl=1
+ SSLLIBS=`$PKGCONFIG --libs gnutls`
+diff -up cups-2.0rc1/cups/http-private.h.no-gcry cups-2.0rc1/cups/http-private.h
+
diff --git a/files/cups-no-gzip-man.patch b/files/cups-no-gzip-man.patch
new file mode 100644
--- /dev/null
+++ b/files/cups-no-gzip-man.patch
@@ -0,0 +1,19 @@
+diff -up cups-2.2.4/config-scripts/cups-manpages.m4.no-gzip-man cups-2.2.4/config-scripts/cups-manpages.m4
+--- cups-2.2.4/config-scripts/cups-manpages.m4.no-gzip-man 2017-06-30 20:37:09.470034273 +0200
++++ cups-2.2.4/config-scripts/cups-manpages.m4 2017-06-30 20:39:15.982884832 +0200
+@@ -53,10 +53,10 @@ case "$host_os_name" in
+ ;;
+ linux* | gnu* | darwin*)
+ # Linux, GNU Hurd, and macOS
+- MAN1EXT=1.gz
+- MAN5EXT=5.gz
+- MAN7EXT=7.gz
+- MAN8EXT=8.gz
++ MAN1EXT=1
++ MAN5EXT=5
++ MAN7EXT=7
++ MAN8EXT=8
+ MAN8DIR=8
+ ;;
+ *)
+
diff --git a/files/cups-systemd-socket.patch b/files/cups-systemd-socket.patch
new file mode 100644
--- /dev/null
+++ b/files/cups-systemd-socket.patch
@@ -0,0 +1,49 @@
+diff -up cups-2.2.2/scheduler/main.c.systemd-socket cups-2.2.2/scheduler/main.c
+--- cups-2.2.2/scheduler/main.c.systemd-socket 2017-01-19 11:12:42.004520240 +0100
++++ cups-2.2.2/scheduler/main.c 2017-01-19 11:12:42.029520021 +0100
+@@ -690,8 +690,15 @@ main(int argc, /* I - Number of comm
+
+ #if defined(HAVE_ONDEMAND)
+ if (OnDemand)
++ {
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
+- else
++# ifdef HAVE_SYSTEMD
++ sd_notifyf(0, "READY=1\n"
++ "STATUS=Scheduler is running...\n"
++ "MAINPID=%lu",
++ (unsigned long) getpid());
++# endif /* HAVE_SYSTEMD */
++ } else
+ #endif /* HAVE_ONDEMAND */
+ if (fg)
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
+diff -up cups-2.2.2/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.2/scheduler/org.cups.cupsd.path.in
+--- cups-2.2.2/scheduler/org.cups.cupsd.path.in.systemd-socket 2017-01-19 11:12:42.029520021 +0100
++++ cups-2.2.2/scheduler/org.cups.cupsd.path.in 2017-01-19 11:19:34.468933097 +0100
+@@ -3,7 +3,7 @@ Description=CUPS Scheduler
+ PartOf=org.cups.cupsd.service
+
+ [Path]
+-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
++PathExistsGlob=@CUPS_REQUESTS@/d*
+
+ [Install]
+ WantedBy=multi-user.target
+diff -up cups-2.2.2/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.2/scheduler/org.cups.cupsd.service.in
+--- cups-2.2.2/scheduler/org.cups.cupsd.service.in.systemd-socket 2017-01-17 20:27:22.000000000 +0100
++++ cups-2.2.2/scheduler/org.cups.cupsd.service.in 2017-01-19 11:12:42.029520021 +0100
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
++After=network.target
+
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+-Type=simple
++Type=notify
+
+ [Install]
+ Also=org.cups.cupsd.socket org.cups.cupsd.path
+
diff --git a/files/cups.sysusers b/files/cups.sysusers
new file mode 100644
--- /dev/null
+++ b/files/cups.sysusers
@@ -0,0 +1,3 @@
+g lp 9 - -
+u lp 9 "Print Service User" /var/spool/cups
+u lpadmin 19 - -
diff --git a/files/series b/files/series
new file mode 100644
--- /dev/null
+++ b/files/series
@@ -0,0 +1,6 @@
+cups-no-gzip-man.patch
+cups-multilib.patch
+cups-no-export-ssllibs.patch
+cups-systemd-socket.patch
+cups-no-gcry.patch
+cups-0755.patch
diff --git a/files/series.COMMENTED b/files/series.COMMENTED
new file mode 100644
--- /dev/null
+++ b/files/series.COMMENTED
@@ -0,0 +1,16 @@
+############################################
+# Almost everything was borrowed from Fedora
+# https://src.fedoraproject.org/rpms/cups/tree/master
+############################################
+# Don't gzip man pages in the Makefile.
+cups-no-gzip-man.patch
+# Prevent multilib conflict in cups-config script.
+cups-multilib.patch
+# Don't export SSLLIBS to cups-config.
+cups-no-export-ssllibs.patch
+# Make cups.service Type=notify (bug #1088918).
+cups-systemd-socket.patch
+# Don't link against libgcrypt needlessly.
+cups-no-gcry.patch
+# fix permissions
+cups-0755.patch
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,59 @@
+name : cups
+version : 2.2.4
+release : 1
+source :
+ - https://github.com/apple/cups/releases/download/v2.2.4/cups-2.2.4-source.tar.gz : 596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc
+homepage : https://www.cups.org/
+license : GPL-2.0
+component : desktop.core
+summary : The Common Unix Printing System
+description: |
+ The Common Unix Printing System (CUPS) is a print spooler and associated utilities. It is based on the "Internet Printing Protocol" and provides printing services to most PostScript and raster printers.
+emul32 : yes
+builddeps :
+ - pkgconfig(avahi-glib)
+ - pkgconfig32(dbus-1)
+ - pkgconfig32(gnutls)
+ - pkgconfig32(libudev)
+ - pkgconfig32(libusb-1.0)
+ - acl-32bit-devel
+ - attr-32bit-devel
+ - glibc-32bit-devel
+ - libgcc-32bit
+ - libpaper-32bit-devel
+ - libstdc++-32bit
+ - pam-32bit-devel
+setup : |
+ # Patches from Fedora - https://src.fedoraproject.org/rpms/cups/tree/master
+ %apply_patches
+
+ # Log to the system journal by default (bug #1078781)
+ sed -i -e 's,^ErrorLog .*$,ErrorLog syslog,' conf/cups-files.conf.in
+ # Add comment text mentioning syslog is systemd journal (bug #1358589)
+ sed -i -e 's,\"syslog\",\"syslog\" \(syslog means systemd journal by default\),' conf/cups-files.conf.in
+
+ # Remove ".SILENT" rule for verbose output (bug #524338)
+ sed -i 's#^.SILENT:##g' Makedefs.in
+
+ # Rebuild configure script for not zipping man-pages.
+ aclocal -I config-scripts
+ autoconf -I config-scripts
+
+ ex_opts=""
+ if [[ ! -z "${EMUL32BUILD}" ]]; then
+ # we should not disable gnutls but for some reason build fails when it's enabled
+ ex_opts="-disable-avahi --disable-dnssd --disable-systemd --disable-gnutls"
+ fi
+
+ %configure $ex_opts --enable-libpaper \
+ --enable-relro \
+ --enable-webif
+
+build : |
+ %make
+install : |
+ %make_install BUILDROOT=$installdir
+
+ install -D -m644 $pkgfiles/cups.sysusers $installdir/%libdir%/sysusers.d/cups.conf
+#check : |
+# %make check
diff --git a/pspec.xml b/pspec.xml
deleted file mode 100644
--- a/pspec.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "https://solus-project.com/standard/pisi-spec.dtd">
-<PISI>
- <Source>
- <Name>cups</Name>
- <Homepage>http://www.cups.org</Homepage>
- <Packager>
- <Name>Ikey Doherty</Name>
- <Email>ikey.doherty@gmail.com</Email>
- </Packager>
- <Summary>The Common Unix Printing System</Summary>
- <Description>The Common Unix Printing System (CUPS) is a print spooler and associated utilities. It is based on the "Internet Printing Protocol" and provides printing services to most PostScript and raster printers.</Description>
- <License>GPLv2+</License>
- <Archive sha1sum="149e9ded0744b7545630c62b6a347e747928e0f7" type="targz">https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz</Archive>
-
- <BuildDependencies>
- <Dependency>libpaper-devel</Dependency>
- <Dependency>libpaper-32bit-devel</Dependency>
- <Dependency type="pkgconfig">avahi-compat-libdns_sd</Dependency>
- <Dependency type="pkgconfig32">libudev</Dependency>
- <Dependency>glibc-32bit-devel</Dependency>
- <Dependency>libgcc-32bit</Dependency>
- <Dependency>dbus-32bit-devel</Dependency>
- <Dependency>dbus-32bit</Dependency>
- <Dependency>libstdc++-32bit</Dependency>
- <Dependency>acl-32bit-devel</Dependency>
- <Dependency>attr-32bit-devel</Dependency>
- </BuildDependencies>
-
- <Patches>
-
- <Patch level="0">cups-1.6.0-fix-install-perms.patch</Patch>
- </Patches>
- </Source>
-
- <Package>
- <Name>cups</Name>
- <Files>
- <Path fileType="executable">/usr/bin</Path>
- <Path fileType="config">/etc/cups</Path>
- <Path fileType="data">/etc/dbus-1</Path>
- <Path fileType="data">/etc/pam.d</Path>
- <Path fileType="library">/usr/lib/cups</Path>
- <Path fileType="library">/usr/lib/lib*.so.*</Path>
- <Path fileType="executable">/usr/sbin</Path>
- <Path fileType="data">/usr/share/applications</Path>
- <Path fileType="data">/usr/share/cups</Path>
- <Path fileType="data">/usr/lib/systemd/system</Path>
- <Path fileType="man">/usr/share/man</Path>
- <Path fileType="data">/usr/share/icons/hicolor</Path>
- <Path fileType="localedata">/usr/share/locale</Path>
- <Path fileType="config">/var</Path>
- </Files>
- <Provides>
- <COMAR script="package.py">System.Package</COMAR>
- </Provides>
- <AdditionalFiles>
- <AdditionalFile target="/etc/cups/client.conf">config</AdditionalFile>
- </AdditionalFiles>
- </Package>
-
- <Package>
- <Name>cups-32bit</Name>
- <BuildType>emul32</BuildType>
- <PartOf>emul32</PartOf>
- <Summary>32-bit files for cups</Summary>
- <Description>32-bit files for cups</Description>
- <Files>
- <Path fileType="library">/usr/lib32/lib*.so.*</Path>
- </Files>
- <RuntimeDependencies>
- <Dependency release="current">cups</Dependency>
- </RuntimeDependencies>
- </Package>
-
- <Package>
- <Name>cups-32bit-devel</Name>
- <BuildType>emul32</BuildType>
- <PartOf>programming.library</PartOf>
- <Summary>32-bit development files for cups</Summary>
- <Description>32-bit development files for cups</Description>
- <Files>
- <Path fileType="library">/usr/lib32/lib*.so</Path>
- </Files>
- <RuntimeDependencies>
- <Dependency release="current">cups-32bit</Dependency>
- <Dependency release="current">cups-devel</Dependency>
- </RuntimeDependencies>
- </Package>
-
- <Package>
- <Name>cups-devel</Name>
- <Summary>Development files for cups</Summary>
- <Description>Development files for cups</Description>
- <Files>
- <Path fileType="header">/usr/include</Path>
- <Path fileType="library">/usr/lib/lib*.so</Path>
- </Files>
- <RuntimeDependencies>
- <Dependency release="current">cups</Dependency>
- </RuntimeDependencies>
- </Package>
-
- <History>
- <Update release="15">
- <Date>04-13-2017</Date>
- <Version>2.2.3</Version>
- <Comment>Update to 2.2.3</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="14">
- <Date>05-22-2016</Date>
- <Version>2.1.0</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="13">
- <Date>03-09-2016</Date>
- <Version>2.1.0</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="12">
- <Date>03-06-2016</Date>
- <Version>2.1.0</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="11">
- <Date>12-28-2015</Date>
- <Version>2.1.0</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="10">
- <Date>12-16-2015</Date>
- <Version>2.1.0</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="9">
- <Date>12-15-2015</Date>
- <Version>2.1.0</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="8">
- <Date>10-05-2015</Date>
- <Version>2.1.0</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="7">
- <Date>10-04-2015</Date>
- <Version>2.1.0</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="6">
- <Date>10-04-2015</Date>
- <Version>2.1.0</Version>
- <Comment>Update to 2.1.0</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="5">
- <Date>07-28-2015</Date>
- <Version>1.6.2</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="4">
- <Date>07-10-2015</Date>
- <Version>1.6.2</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="3" type="security">
- <Date>10-15-2014</Date>
- <Version>1.6.2</Version>
- <Comment>CVE-2014-2856:
-Cross-site scripting (XSS) vulnerability in scheduler/client.c in Common Unix Printing System (CUPS) before 1.7.2 allows remote attackers to inject arbitrary web script or HTML via the URL path, related to the is_path_absolute function.
-</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@evolve-os.com</Email>
- </Update>
-
- <Update release="2">
- <Date>06-21-2014</Date>
- <Version>1.6.2</Version>
- <Comment>Fix splitting, use auto-deps</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey.doherty@gmail.com</Email>
- </Update>
-
- <Update release="1">
- <Date>06-16-2013</Date>
- <Version>1.6.2</Version>
- <Comment>Add cups 1.6.2 to repositories</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solusos.com</Email>
- </Update>
- </History>
-</PISI>
\ No newline at end of file
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,147 @@
+<PISI>
+ <Source>
+ <Name>cups</Name>
+ <Homepage>https://www.cups.org/</Homepage>
+ <Packager>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
+ </Packager>
+ <License>GPL-2.0</License>
+ <PartOf>desktop.core</PartOf>
+ <Summary xml:lang="en">The Common Unix Printing System</Summary>
+ <Description xml:lang="en">The Common Unix Printing System (CUPS) is a print spooler and associated utilities. It is based on the &quot;Internet Printing Protocol&quot; and provides printing services to most PostScript and raster printers.
+</Description>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ </Source>
+ <Package>
+ <Name>cups</Name>
+ <Summary xml:lang="en">The Common Unix Printing System</Summary>
+ <Description xml:lang="en">The Common Unix Printing System (CUPS) is a print spooler and associated utilities. It is based on the &quot;Internet Printing Protocol&quot; and provides printing services to most PostScript and raster printers.
+</Description>
+ <PartOf>desktop.core</PartOf>
+ <Files>
+ <Path fileType="config">/etc/cups/cups-files.conf</Path>
+ <Path fileType="config">/etc/cups/cups-files.conf.N</Path>
+ <Path fileType="config">/etc/cups/cups-files.conf.default</Path>
+ <Path fileType="config">/etc/cups/cupsd.conf</Path>
+ <Path fileType="config">/etc/cups/cupsd.conf.N</Path>
+ <Path fileType="config">/etc/cups/cupsd.conf.default</Path>
+ <Path fileType="config">/etc/cups/ppd</Path>
+ <Path fileType="config">/etc/cups/snmp.conf</Path>
+ <Path fileType="config">/etc/cups/snmp.conf.N</Path>
+ <Path fileType="config">/etc/cups/snmp.conf.default</Path>
+ <Path fileType="config">/etc/cups/ssl</Path>
+ <Path fileType="config">/etc/dbus-1/system.d/cups.conf</Path>
+ <Path fileType="config">/etc/init.d/cups</Path>
+ <Path fileType="config">/etc/pam.d/cups</Path>
+ <Path fileType="config">/etc/pam.d/cups.N</Path>
+ <Path fileType="config">/etc/rc0.d/K36cups</Path>
+ <Path fileType="config">/etc/rc2.d/K36cups</Path>
+ <Path fileType="config">/etc/rc2.d/S81cups</Path>
+ <Path fileType="config">/etc/rc3.d/K36cups</Path>
+ <Path fileType="config">/etc/rc3.d/S81cups</Path>
+ <Path fileType="config">/etc/rc5.d/K36cups</Path>
+ <Path fileType="config">/etc/rc5.d/S81cups</Path>
+ <Path fileType="executable">/usr/bin</Path>
+ <Path fileType="library">/usr/lib/cups/backend/dnssd</Path>
+ <Path fileType="library">/usr/lib/cups/backend/http</Path>
+ <Path fileType="library">/usr/lib/cups/backend/https</Path>
+ <Path fileType="library">/usr/lib/cups/backend/ipp</Path>
+ <Path fileType="library">/usr/lib/cups/backend/ipps</Path>
+ <Path fileType="library">/usr/lib/cups/backend/lpd</Path>
+ <Path fileType="library">/usr/lib/cups/backend/snmp</Path>
+ <Path fileType="library">/usr/lib/cups/backend/socket</Path>
+ <Path fileType="library">/usr/lib/cups/backend/usb</Path>
+ <Path fileType="library">/usr/lib/cups/cgi-bin/admin.cgi</Path>
+ <Path fileType="library">/usr/lib/cups/cgi-bin/classes.cgi</Path>
+ <Path fileType="library">/usr/lib/cups/cgi-bin/help.cgi</Path>
+ <Path fileType="library">/usr/lib/cups/cgi-bin/jobs.cgi</Path>
+ <Path fileType="library">/usr/lib/cups/cgi-bin/printers.cgi</Path>
+ <Path fileType="library">/usr/lib/cups/daemon/cups-deviced</Path>
+ <Path fileType="library">/usr/lib/cups/daemon/cups-driverd</Path>
+ <Path fileType="library">/usr/lib/cups/daemon/cups-exec</Path>
+ <Path fileType="library">/usr/lib/cups/daemon/cups-lpd</Path>
+ <Path fileType="library">/usr/lib/cups/driver</Path>
+ <Path fileType="library">/usr/lib/cups/filter/commandtops</Path>
+ <Path fileType="library">/usr/lib/cups/filter/gziptoany</Path>
+ <Path fileType="library">/usr/lib/cups/filter/pstops</Path>
+ <Path fileType="library">/usr/lib/cups/filter/rastertodymo</Path>
+ <Path fileType="library">/usr/lib/cups/filter/rastertoepson</Path>
+ <Path fileType="library">/usr/lib/cups/filter/rastertohp</Path>
+ <Path fileType="library">/usr/lib/cups/filter/rastertolabel</Path>
+ <Path fileType="library">/usr/lib/cups/filter/rastertopwg</Path>
+ <Path fileType="library">/usr/lib/cups/monitor/bcp</Path>
+ <Path fileType="library">/usr/lib/cups/monitor/tbcp</Path>
+ <Path fileType="library">/usr/lib/cups/notifier/dbus</Path>
+ <Path fileType="library">/usr/lib/cups/notifier/mailto</Path>
+ <Path fileType="library">/usr/lib/cups/notifier/rss</Path>
+ <Path fileType="library">/usr/lib/systemd/system/org.cups.cups-lpd.socket</Path>
+ <Path fileType="library">/usr/lib/systemd/system/org.cups.cups-lpd@.service</Path>
+ <Path fileType="library">/usr/lib/systemd/system/org.cups.cupsd.path</Path>
+ <Path fileType="library">/usr/lib/systemd/system/org.cups.cupsd.service</Path>
+ <Path fileType="library">/usr/lib/systemd/system/org.cups.cupsd.socket</Path>
+ <Path fileType="library">/usr/lib64/lib*.so.*</Path>
+ <Path fileType="library">/usr/lib64/sysusers.d/cups.conf</Path>
+ <Path fileType="executable">/usr/sbin</Path>
+ <Path fileType="data">/usr/share/cups</Path>
+ <Path fileType="doc">/usr/share/doc</Path>
+ <Path fileType="localedata">/usr/share/locale</Path>
+ <Path fileType="man">/usr/share/man</Path>
+ <Path fileType="data">/var/cache/cups/rss</Path>
+ <Path fileType="data">/var/log/cups</Path>
+ <Path fileType="data">/var/run/cups/certs</Path>
+ <Path fileType="data">/var/spool/cups/tmp</Path>
+ </Files>
+ </Package>
+ <Package>
+ <Name>cups-32bit</Name>
+ <Summary xml:lang="en">32-bit libraries for cups</Summary>
+ <Description xml:lang="en">The Common Unix Printing System (CUPS) is a print spooler and associated utilities. It is based on the &quot;Internet Printing Protocol&quot; and provides printing services to most PostScript and raster printers.
+</Description>
+ <PartOf>emul32</PartOf>
+ <RuntimeDependencies>
+ <Dependency release="1">cups</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="library">/usr/lib32/</Path>
+ <Path fileType="library">/usr/lib32/lib*.so.*</Path>
+ </Files>
+ </Package>
+ <Package>
+ <Name>cups-32bit-devel</Name>
+ <Summary xml:lang="en">Development files for 32-bit cups</Summary>
+ <Description xml:lang="en">The Common Unix Printing System (CUPS) is a print spooler and associated utilities. It is based on the &quot;Internet Printing Protocol&quot; and provides printing services to most PostScript and raster printers.
+</Description>
+ <PartOf>programming.devel</PartOf>
+ <RuntimeDependencies>
+ <Dependency release="1">cups-devel</Dependency>
+ <Dependency release="1">cups-32bit</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="library">/usr/lib32/lib*.so</Path>
+ </Files>
+ </Package>
+ <Package>
+ <Name>cups-devel</Name>
+ <Summary xml:lang="en">Development files for cups</Summary>
+ <Description xml:lang="en">The Common Unix Printing System (CUPS) is a print spooler and associated utilities. It is based on the &quot;Internet Printing Protocol&quot; and provides printing services to most PostScript and raster printers.
+</Description>
+ <PartOf>programming.devel</PartOf>
+ <RuntimeDependencies>
+ <Dependency release="1">cups</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="header">/usr/include/</Path>
+ <Path fileType="library">/usr/lib64/lib*.so</Path>
+ </Files>
+ </Package>
+ <History>
+ <Update release="1">
+ <Date>2017-08-12</Date>
+ <Version>2.2.4</Version>
+ <Comment>Packaging update</Comment>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
+ </Update>
+ </History>
+</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 25, 3:14 AM (2 w, 17 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5813590
Default Alt Text
D809.id1781.diff (33 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.