--- libice-1.1.1.orig/.gitlab-ci.yml +++ libice-1.1.1/.gitlab-ci.yml @@ -0,0 +1,99 @@ +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml: +# +# This CI uses the freedesktop.org ci-templates. +# Please see the ci-templates documentation for details: +# https://freedesktop.pages.freedesktop.org/ci-templates/ + +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile + + +include: + # Debian container builder template + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/debian.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' + - template: Security/SAST.gitlab-ci.yml + + +stages: + - prep # prep work like rebuilding the container images if there is a change + - build # for actually building and testing things in a container + - test + - deploy + + +variables: + FDO_UPSTREAM_REPO: 'xorg/lib/libICE' + FDO_DISTRIBUTION_VERSION: 'stable' + # The tag should be updated each time the list of packages is updated. + # Changing a tag forces the associated image to be rebuilt. + # Note: the tag has no meaning, we use a date format purely for readability + FDO_DISTRIBUTION_TAG: '2022-04-30.1' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev x11proto-dev xtrans-dev libbsd-dev xmlto xorg-sgml-doctools w3m xsltproc fop' + + +# +# Verify that commit messages are as expected +# +check-commits: + extends: + - .fdo.ci-fairy + stage: prep + script: + - ci-fairy check-commits --junit-xml=results.xml + except: + - master@xorg/lib/libICE + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + +# +# Verify that the merge request has the allow-collaboration checkbox ticked +# +check-merge-request: + extends: + - .fdo.ci-fairy + stage: deploy + script: + - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml + artifacts: + when: on_failure + reports: + junit: results.xml + allow_failure: true + + +# +# Build a container with the given tag and the packages pre-installed. +# This only happens if/when the tag changes, otherwise the existing image is +# re-used. +# +container-prep: + extends: + - .fdo.container-build@debian + stage: prep + variables: + GIT_STRATEGY: none + + +# +# The default build, runs on the image built above. +# +build: + stage: build + extends: + - .fdo.distribution-image@debian + script: + - autoreconf -ivf + - mkdir _builddir + - pushd _builddir > /dev/null + - ../configure --disable-silent-rules --enable-docs --enable-specs + - make + - make check + - make distcheck + - popd > /dev/null --- libice-1.1.1.orig/autogen.sh +++ libice-1.1.1/autogen.sh @@ -0,0 +1,17 @@ +#! /bin/sh + +srcdir=`dirname "$0"` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd "$srcdir" + +autoreconf -v --install || exit 1 +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH libICE" + +if test -z "$NOCONFIGURE"; then + exec "$srcdir"/configure "$@" +fi --- libice-1.1.1.orig/debian/README.source +++ libice-1.1.1/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +salsa.debian.org in the xorg-team group. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into salsa.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- libice-1.1.1.orig/debian/changelog +++ libice-1.1.1/debian/changelog @@ -0,0 +1,272 @@ +libice (2:1.1.1-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * Update README.source. + * watch: Update upstream git url. + + [ Debian Janitor ] + * Trim trailing whitespace. + * Bump debhelper from old 12 to 13. + + debian/rules: Drop --fail-missing argument to dh_missing, which is now the + default. + * Update standards version to 4.6.1, no changes needed. + * Remove constraints unnecessary since buster (oldstable): + + Build-Depends: Drop versioned constraint on xtrans-dev (>= 1.0.1). + + Build-Depends: Drop versioned constraint on xutils-dev (>= 1:7.6+2). + + Build-Depends-Indep: Drop versioned constraint on xmlto (>= 0.0.22). + + Build-Depends-Indep: Drop versioned constraint on xorg-sgml-doctools (>= + 1:1.8). + + libice-doc: Drop conflict with removed package libice-dev (<< 2:1.0.8) in + Replaces. + + libice-doc: Drop conflict with removed package libice-dev (<< 2:1.0.8) in + Breaks. + + [ Julien Cristau ] + * New upstream release. + + -- Julien Cristau Thu, 31 Oct 2024 16:52:13 +0100 + +libice (2:1.0.10-1) unstable; urgency=medium + + * New upstream selease. + * Bump debhelper to 12. + * Migrate to -dbgsym. + * Bump policy to 4.5.0. + * control: Update VCS urls. + * Migrate to x11proto-dev. + + -- Timo Aaltonen Thu, 24 Sep 2020 11:25:46 +0300 + +libice (2:1.0.9-2) unstable; urgency=medium + + [ Julien Cristau ] + * CVE-2017-2626: Use libbsd for arc4random. Closes: #856400. + * Bump Standards-Version to 3.9.6, update Vcs-* control fields. + + [ Emilio Pozuelo Monfort ] + * Remove Drew from Uploaders. + + -- Emilio Pozuelo Monfort Tue, 28 Feb 2017 22:46:39 +0100 + +libice (2:1.0.9-1) unstable; urgency=medium + + * New upstream release. + * Remove Cyril from Uploaders. + * Rewrite debian/rules using dh. Switch to compat level 9. + + -- Julien Cristau Sun, 13 Jul 2014 01:38:11 +0200 + +libice (2:1.0.8-2) unstable; urgency=low + + * Add missing Replaces/Breaks on libice-dev in the doc package. Thanks, + Sven Joachim! + + -- Julien Cristau Mon, 09 Apr 2012 20:08:47 +0200 + +libice (2:1.0.8-1) unstable; urgency=low + + * New upstream release. + * Bump xutils-dev, xmlto and xorg-sgml-doctools build-deps. + * Pass the shlib version to dh_makeshlibs instead of using a .shlibs file. + * Stop installing xorg.css, it's no longer shipped. + * Don't require (fake)root for debian/rules clean. + * Split the protocol spec and API doc to a separate libice-doc package. + Disable the docs in the build-arch target. + * Mark libice-dev as multi-arch capable. + + -- Julien Cristau Mon, 09 Apr 2012 17:01:09 +0200 + +libice (2:1.0.7-2) unstable; urgency=low + + * Team upload. + + [ Julien Cristau ] + * Drop Pre-Depends on x11-common, only needed for upgrades from the + monolith. + * Remove David Nusinow from Uploaders. + * Bump Standards-Version to 3.9.2. + + [ Steve Langasek ] + * Build for multiarch. + + -- Julien Cristau Thu, 09 Jun 2011 20:46:55 +0200 + +libice (2:1.0.7-1) unstable; urgency=low + + * New upstream release. + * Drop 0001-Set-the-close-on-exec-flag-for-listening-sockets.patch + * Bump xutils-dev build-dep for new macros. + * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. + * Kill *.xml in the doc directory, no point in shipping them. + * Ship *.html, *.css, and *.txt from the doc directory. + * Switch from --list-missing to --fail-missing for additional safety. + + -- Cyril Brulebois Mon, 08 Nov 2010 01:24:07 +0100 + +libice (2:1.0.6-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * Cherry-pick from upstream: + + 0001-Set-the-close-on-exec-flag-for-listening-sockets.patch: + Stop leaking listening sockets by setting the close on exec flag on + them. Thanks to Kalle Olavi Niemitalo (Closes: #538248). + [From upstream 1967c04c0] + * Add myself to Uploaders. + + -- Cyril Brulebois Fri, 29 Oct 2010 14:56:48 +0200 + +libice (2:1.0.6-1) unstable; urgency=low + + [ Julien Cristau ] + * libice6-dbg doesn't need to depend on x11-common. + * Remove the debian revision from the xtrans-dev build-dep. + * Move -dbg package to the debug section. + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + + -- Julien Cristau Mon, 23 Nov 2009 17:41:57 +0100 + +libice (2:1.0.5-1) unstable; urgency=low + + [ Brice Goglin ] + * Bump Standards-Version to 3.7.3 (no changes). + * Drop the XS- prefix from Vcs-Git and Vcs-Browser fields in debian/control. + * Add a link to www.X.org and a reference to the upstream module + in the long description. + + [ Julien Cristau ] + * New upstream release. + * Run autoreconf on build. Build-depend on automake, libtool and xutils-dev + (>= 1:7.4+4). + * Handle parallel builds. + + -- Julien Cristau Thu, 19 Feb 2009 17:34:32 +0100 + +libice (2:1.0.4-1) unstable; urgency=low + + [ Julien Cristau ] + * Sync package sections with the override. + + [ Brice Goglin ] + * New upstream release. + * Fix typo in long descriptions, thanks Philippe Cloutier + (closes: #436009). + + -- Brice Goglin Tue, 21 Aug 2007 09:16:11 +0200 + +libice (2:1.0.3-3) unstable; urgency=low + + [ Julien Cristau ] + * Fix the name of the XS-Vcs-Browser field. + * Add the upstream URL to debian/copyright. + * Add myself to Uploaders, and remove Fabio and Branden with their + permission. + * s/Source-Version/binary:Version/ in debian/control. + + [ Timo Aaltonen ] + * Bump the epoch so that this can be synced to Ubuntu in the future. + + -- Julien Cristau Mon, 23 Jul 2007 18:26:56 +0200 + +libice (1:1.0.3-2) unstable; urgency=low + + * Remove outdated cvs information from the package descriptions, and add + XS-Vcs-* headers. + * Upload to unstable. + + -- Julien Cristau Tue, 10 Apr 2007 19:00:04 +0200 + +libice (1:1.0.3-1) experimental; urgency=low + + * New upstream release. + * Install the upstream ChangeLog. + + -- Julien Cristau Fri, 9 Feb 2007 17:10:45 +0100 + +libice (1:1.0.1-2) unstable; urgency=low + + [ David Nusinow ] + * Add shlibs file to the package, and have it require libice from modular. + Thanks Daniel Stone. (closes: #374775) + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + + [ Drew Parsons ] + * dbg package has priority extra. + * exclude libICE.la from dh_install + * upload to unstable (X11R7.1) + + -- Drew Parsons Fri, 8 Sep 2006 22:26:27 +1000 + +libice (1:1.0.1-1) experimental; urgency=low + + * New upstream release + * Run dh_install with --list-missing + * Bump debhelper compat to 5 + * Remove extra x11-common dep in -dev package + * Version x11-common pre-dep in -dev package to use 1:7.0.0 to match the + rest of Debian and shut lintian up + * Bump build-dep version on xtrans-dev to 1.0.1-1 to make sure we get the + security fix + * Bump standards version to 3.7.2.0 + * Don't look to install manpages for the -dev package, there aren't any + + -- David Nusinow Mon, 3 Jul 2006 16:54:13 -0400 + +libice (1:1.0.0-3) unstable; urgency=low + + * Reorder makeshlib command in rules file so that ldconfig is run + properly. Thanks Drew Parsons and Steve Langasek. + + -- David Nusinow Tue, 18 Apr 2006 21:49:55 -0400 + +libice (1:1.0.0-2) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Thu, 23 Mar 2006 22:44:24 -0500 + +libice (1:1.0.0-1) experimental; urgency=low + + * First upload to Debian + * Remove 016_ICE_subprotocol_reply_fix.diff as it is now obsolete. Thanks + Eugene Konev. + + -- David Nusinow Thu, 5 Jan 2006 01:19:13 -0500 + +libice (1:6.3.5-4) breezy; urgency=low + + * Implicit deps are bad, mmmk? + Fixed those, so ICE nolonger SEGV's on ia64. + + -- LaMont Jones Tue, 4 Oct 2005 04:52:10 -0600 + +libice (1:6.3.5-3) breezy; urgency=low + + * Add 016_ICE_subprotocol_reply_fix.diff, from the monolithic tree. + * Remove pointless #include in ICEutil.h. + * Make Build-Depend xtrans versioned to a fixed one, to keep buildds a + little bit happier. + + -- Daniel Stone Wed, 1 Jun 2005 12:34:51 +1000 + +libice (1:6.3.5-2) breezy; urgency=low + + * Fix Build-Depends-Indep vs B-D hilary/stupidity. + + -- Daniel Stone Wed, 1 Jun 2005 00:33:36 +1000 + +libice (1:6.3.5-1) breezy; urgency=low + + * First libice release. + + -- Daniel Stone Mon, 16 May 2005 22:10:17 +1000 --- libice-1.1.1.orig/debian/control +++ libice-1.1.1/debian/control @@ -0,0 +1,67 @@ +Source: libice +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Build-Depends: + debhelper-compat (= 13), + quilt, + pkg-config, + x11proto-dev, + xtrans-dev, + xutils-dev, + libbsd-dev, +Build-Depends-Indep: + xmlto, + xorg-sgml-doctools, + w3m, +Standards-Version: 4.6.1 +Vcs-Git: https://salsa.debian.org/xorg-team/lib/libice.git +Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libice + +Package: libice6 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: X11 Inter-Client Exchange library + This package provides the main interface to the X11 Inter-Client Exchange + library, which allows for communication of data between X clients. + . + More information about X.Org can be found at: + + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libICE + +Package: libice-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, libice6 (= ${binary:Version}), x11proto-dev +Suggests: libice-doc +Description: X11 Inter-Client Exchange library (development headers) + This package provides the main interface to the X11 Inter-Client Exchange + library, which allows for communication of data between X clients. + . + This package contains the development headers for the library found in libice6. + Non-developers likely have little use for this package. + . + More information about X.Org can be found at: + + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libICE + +Package: libice-doc +Architecture: all +Multi-Arch: foreign +Section: doc +Depends: + ${misc:Depends}, +Description: documentation for the X11 ICE protocol and library + The Inter-Client Exchange (ICE) Protocol allows for communication of data + between X clients. + . + This package contains the ICE protocol specification and documentation for the + ICE library. --- libice-1.1.1.orig/debian/copyright +++ libice-1.1.1/debian/copyright @@ -0,0 +1,26 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/lib/ + +Copyright 1993, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +Author: Ralph Mor, X Consortium --- libice-1.1.1.orig/debian/libice-dev.install +++ libice-1.1.1/debian/libice-dev.install @@ -0,0 +1,4 @@ +usr/include/X11/* +usr/lib/*/libICE.a +usr/lib/*/libICE.so +usr/lib/*/pkgconfig/ice.pc --- libice-1.1.1.orig/debian/libice-doc.install +++ libice-1.1.1/debian/libice-doc.install @@ -0,0 +1 @@ +usr/share/doc/libice-dev --- libice-1.1.1.orig/debian/libice6.install +++ libice-1.1.1/debian/libice6.install @@ -0,0 +1 @@ +usr/lib/*/libICE.so.6* --- libice-1.1.1.orig/debian/rules +++ libice-1.1.1/debian/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f +# debian/rules for the Debian libice package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# set this to the name of the main shlib's binary package +PACKAGE = libice6 + +%: + dh $@ --with quilt --builddirectory=build/ + +override_dh_auto_configure-arch: docflags = --disable-docs --disable-specs +override_dh_auto_configure-indep: docflags = --enable-docs --enable-specs +override_dh_auto_configure-arch override_dh_auto_configure-indep: + dh_auto_configure -- \ + --docdir=\$${datadir}/doc/libice-dev \ + --disable-silent-rules \ + $(docflags) + +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --sourcedir=debian/tmp + +override_dh_strip: + dh_strip -p$(PACKAGE) --dbgsym-migration='libice6-dbg (<< 2:1.0.10-1~)' + dh_strip -N$(PACKAGE) + +override_dh_makeshlibs: + dh_makeshlibs -a -V'$(PACKAGE) (>= 1:1.0.0)' --- libice-1.1.1.orig/debian/watch +++ libice-1.1.1/debian/watch @@ -0,0 +1,3 @@ +#git=https://gitlab.freedesktop.org/xorg/lib/libice +version=3 +http://xorg.freedesktop.org/releases/individual/lib/ libICE-(.*)\.tar\.gz