debian/0000775000000000000000000000000013260672112007170 5ustar debian/rules0000775000000000000000000000153712246424516010264 0ustar #!/usr/bin/make -f export CFLAGS := -Wall -W $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) ifeq "$(origin CC)" "default" export CC := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)-gcc endif %: dh ${@} override_dh_auto_build: $(MAKE) CC="$(CC)" LDFLAGS="$(LDFLAGS)" DESTDIR="$(CURDIR)/debian/tmp" PREFIX=/usr ETC=/etc override_dh_auto_install: # $(MAKE) doc $(MAKE) DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr ETC=/etc LIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)" install override_dh_installchangelogs: dh_installchangelogs NEWS get-orig-source: @d=$$(readlink -e $(MAKEFILE_LIST)); \ cd $${d%/*}/..; \ debian/get-orig-source.sh $(CURDIR) .PHONY: override_dh_auto_build override_dh_auto_install override_dh_installchangelogs get-orig-source debian/libixp-dev.install0000664000000000000000000000006512246424556012636 0ustar usr/bin/* usr/include/* usr/lib/*/*.a usr/lib/*/*.so debian/libixp0.install0000664000000000000000000000002112246425100012114 0ustar usr/lib/*/*.so.* debian/patches/0000775000000000000000000000000012246425513010623 5ustar debian/patches/02-no-silent.patch0000664000000000000000000000057412122126255013773 0ustar Description: No .SILENT. Author: Andrew Shadura --- libixp-0.6~20110914+hg148.orig/mk/hdr.mk +++ libixp-0.6~20110914+hg148/mk/hdr.mk @@ -55,7 +55,7 @@ MKCFG:=$(shell $(MKCFGSH)) MKCFG!=$(MKCFGSH) include $(MKCFG) -.SILENT: +#.SILENT: .SUFFIXES: .out .o .o_pic .c .pdf .sh .rc .$(SOEXT) .awk .1 .3 .man1 .man3 .depend .install .uninstall .clean all: debian/patches/01-spelling.patch0000664000000000000000000000257312057600563013706 0ustar Description: Fix spelling. 'Beginning' is 'beginning', not 'begining'. Author: Andrew Shadura --- a/include/ixp.h +++ b/include/ixp.h @@ -291,7 +291,7 @@ MsgUnpack, }; struct IxpMsg { - char* data; /* Begining of buffer. */ + char* data; /* Beginning of buffer. */ char* pos; /* Current position in buffer. */ char* end; /* End of message. */ uint size; /* Size of buffer. */ --- a/lib/libixp/message.c +++ b/lib/libixp/message.c @@ -211,7 +211,7 @@ * * These functions pack or unpack a 9P protocol message. The * message is set to the appropriate mode and its position is - * set to the begining of its buffer. + * set to the beginning of its buffer. * * Returns: * These functions return the size of the message on --- a/man/IxpMsg.3 +++ b/man/IxpMsg.3 @@ -13,7 +13,7 @@ typedef struct IxpMsg IxpMsg; struct IxpMsg { - char* data; /* Begining of buffer. */ + char* data; /* Beginning of buffer. */ char* pos; /* Current position in buffer. */ char* end; /* End of message. */ uint size; /* Size of buffer. */ --- a/man/ixp_fcall2msg.3 +++ b/man/ixp_fcall2msg.3 @@ -22,7 +22,7 @@ .P These functions pack or unpack a 9P protocol message. The message is set to the appropriate mode and its position is -set to the begining of its buffer. +set to the beginning of its buffer. .SH RETURN VALUE debian/patches/01-link-dynamically.patch0000664000000000000000000000341012246425513015321 0ustar From: Andrew Shadura Subject: Link dynamically. --- a/config.mk +++ b/config.mk @@ -14,7 +14,7 @@ # Includes and libs INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include -LIBS = -L/usr/lib -lc $(LDLIBS) +LIBS = $(LDLIBS) # Flags include $(ROOT)/mk/gcc.mk @@ -34,7 +34,7 @@ #CFLAGS += -xtarget=ultra # Misc -#MAKESO = 1 +MAKESO = 1 SOLDFLAGS = $(LDFLAGS) SHARED = -shared -Wl,-soname=$(SONAME) --- a/mk/so.mk +++ b/mk/so.mk @@ -1,17 +1,18 @@ +SO_MAJOR ?= 0 SOPTARG = $(ROOT)/lib/$(TARG) -SO = $(SOPTARG).$(SOEXT) -SONAME = $(TARG).$(SOEXT) +SO = $(SOPTARG).$(SOEXT).$(SO_MAJOR) +SONAME = $(TARG).$(SOEXT).$(SO_MAJOR) OFILES_PIC = $(OBJ:=.o_pic) all: $(HFILES) $(SO) -install: $(SOPTARG).install -uninstall: $(SOPTARG).uninstall +install: soinstall +uninstall: souninstall clean: soclean depend: $(OBJ:=.depend) soclean: - for i in $(SO) $(OFILES_PIC); do \ + for i in $(SO) $(SO:.$(SO_MAJOR)=) $(OFILES_PIC); do \ [ -e $$i ] && \ echo CLEAN $$($(CLEANNAME) $(BASE)$$i); \ rm -f $$i; \ @@ -23,7 +24,16 @@ printinstall: printsoinstall +soinstall: + $(INSTALL) -b 0644 $(SO) $(LIBDIR) $(SO) + _() { echo CP $$1 $${2##*/}; cp -d $$1 $(DESTDIR)$$2; }; _ $(SO:.$(SO_MAJOR)=) $(LIBDIR)/$(SONAME:.$(SO_MAJOR)=) + +souninstall: + $(UNINSTALL) $(SO) $(LIBDIR) $(SO) + _() { echo RM $${2##*/}; rm -f $(DESTDIR)$$2; }; _ $(SO:.$(SO_MAJOR)=) $(LIBDIR)/$(SONAME:.$(SO_MAJOR)=) + $(SO): $(OFILES_PIC) mkdir $(ROOT)/lib 2>/dev/null || true $(LINKSO) $@ $(OFILES_PIC) + echo LN $@; ln -sf $(SONAME) $(SO:.$(SO_MAJOR)=) --- a/lib/libixp_pthread/Makefile +++ b/lib/libixp_pthread/Makefile @@ -2,7 +2,7 @@ include $(ROOT)/mk/hdr.mk include $(ROOT)/mk/ixp.mk -LIBS += -lpthread +LIBS += -lpthread ../libixp.so TARG = libixp_pthread debian/patches/03-append-to-ldflags.patch0000664000000000000000000000044412246420340015360 0ustar Description: Don't use DEBUGCFLAGS. Author: Andrew Shadura --- a/config.mk +++ b/config.mk @@ -18,7 +18,7 @@ # Flags include $(ROOT)/mk/gcc.mk -CFLAGS += $(DEBUGCFLAGS) $(INCS) +CFLAGS += $(INCS) LDFLAGS = # Compiler, Linker. Linker should usually *not* be ld. debian/patches/series0000664000000000000000000000016012246417577012050 0ustar 00-fix-buildsys.patch 01-link-dynamically.patch 01-spelling.patch 02-no-silent.patch 03-append-to-ldflags.patch debian/patches/00-fix-buildsys.patch0000664000000000000000000000205312246420253014477 0ustar From: Andrew Shadura Subject: Fix some non-uniformities in the build system. --- a/config.mk +++ b/config.mk @@ -14,15 +14,15 @@ # Includes and libs INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include -LIBS = -L/usr/lib -lc +LIBS = -L/usr/lib -lc $(LDLIBS) # Flags include $(ROOT)/mk/gcc.mk CFLAGS += $(DEBUGCFLAGS) $(INCS) -LDFLAGS = -g $(LDLIBS) $(LIBS) +LDFLAGS = # Compiler, Linker. Linker should usually *not* be ld. -CC = cc -c +CC = cc LD = cc # Archiver AR = ar crs @@ -35,6 +35,8 @@ # Misc #MAKESO = 1 +SOLDFLAGS = $(LDFLAGS) +SHARED = -shared -Wl,-soname=$(SONAME) # Extra Components IGNORE = \ --- a/mk/hdr.mk +++ b/mk/hdr.mk @@ -22,7 +22,7 @@ EXCFLAGS = $(INCLUDES) -D_XOPEN_SOURCE=600 -COMPILE_FLAGS = $(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES)) +COMPILE_FLAGS = $(EXCFLAGS) -c $(CFLAGS) $$(pkg-config --cflags $(PACKAGES)) COMPILE = $(SHELL) $(ROOT)/util/compile "$(CC)" "$(COMPILE_FLAGS)" COMPILEPIC = $(SHELL) $(ROOT)/util/compile "$(CC)" "$(COMPILE_FLAGS) $(SOCFLAGS)" debian/changelog0000664000000000000000000001267113260672112011051 0ustar libixp (0.6~20121202+hg148-2build1) bionic; urgency=high * No change rebuild to pick up -fPIE compiler default -- Balint Reczey Tue, 03 Apr 2018 12:32:10 +0000 libixp (0.6~20121202+hg148-2) unstable; urgency=low * Fix some issues in the build system. * Build a dynamic library as well. * Update the copyright file. -- Andrew Shadura Sun, 01 Dec 2013 17:16:45 +0100 libixp (0.6~20121202+hg148-1) unstable; urgency=low * Upload to unstable. * Use DESTDIR and PREFIX properly. -- Andrew Shadura Fri, 12 Apr 2013 21:04:37 +0200 libixp (0.6~20110914+hg148-1) experimental; urgency=low * New upstream snapshot. * Drop patches applied upstream. * Drop patch to allow overriding CC as upstream uses a different meaning of CC variable in their build system; pass a modified CC variable as a make argument instead. * Disable .SILENT during build. * Fix hardening: make sure our LDFLAGS don't get overwritten. -- Andrew Shadura Tue, 19 Mar 2013 19:31:53 +0100 libixp (0.6~20110914+hg142-1) experimental; urgency=low * New maintainer (Closes: #606082). * New upstream snapshot. * Fix a typo in a deprecated API call wrapper. * Rename the binary package to libixp-dev, providing transitional dummy package libixp. * Link threaded version against libpthread. * Use hardening flags, don't disable optimisation (unlike upstream does). * Enable using different CC, e.g. ccache. * Enable cross-compilation when needed. * Add Vcs-* fields. * Install manual pages. * Fix typos in the sources and manual pages. * Modify manual pages' installation rules to replace form feed characters by proper \f *roff control sequences. * In ixpc, use proper ssize_t type instead of unsigned int. * Update Standards-Version to 3.9.3, no relevant changes. * Update the Homepage field: the project is no longer under Suckless umbrella. * Add get-orig-source target to debian/rules. * Update the package description. * Use debhelper version 9; update the build dependencies accordingly. No changes to the packaging were required. * Install upstream NEWS as a changelog. * Adjust package sections (binary package goes to libdevel, source goes to libs as there's nothing X11-specific). * Update copyright information (code under Lucent Public License is no more). * Fix copyright file syntax to comply with the Copyright Format 1.0. -- Andrew O. Shadura Wed, 15 Aug 2012 08:53:10 +0200 libixp (0.5-5) unstable; urgency=low * Orphaning package. -- Daniel Baumann Sun, 05 Dec 2010 22:53:33 +0100 libixp (0.5-4) experimental; urgency=low * Updating standards version to 3.9.0. * Switching to source format 3.0 (quilt). * Updating to debhelper version 8. * Updating to standards version 3.9.1. -- Daniel Baumann Mon, 29 Nov 2010 21:15:45 +0100 libixp (0.5-3) unstable; urgency=low * Adding maintainer homepage field to control. * Marking maintainer homepage field to be also included in binary packages and changelog. * Adding README.source. * Moving maintainer homepage field from control to copyright. * Removing README.source. * Updating homepage field in control. * Bumping versioned build-depends on debhelper. * Removing override for dh_auto_build, not required. * Correcting typo in make call of dh_auto_install override in rules. * Adding explicit debian source version 1.0 until switch to 3.0. * Updating year in copyright file. * Updating to standards 3.8.4. -- Daniel Baumann Wed, 07 Apr 2010 00:26:27 +0200 libixp (0.5-2) unstable; urgency=low * Replacing obsolete dh_clean -k with dh_prep. * Using correct rfc-2822 date formats in changelog. * Updating maintainer field. * Updating vcs fields. * Updating package to standards version 3.8.3. * Sorting depends. * Updating year in copyright file. * Minimizing rules file. -- Daniel Baumann Thu, 20 Aug 2009 20:20:40 +0200 libixp (0.5-1) unstable; urgency=low * Updating vcs fields in control file. * Merging upstream version 0.5. -- Daniel Baumann Wed, 05 Nov 2008 21:03:00 +0100 libixp (0.4-3) unstable; urgency=medium * Rewriting copyright file in machine-interpretable format. * Reordering rules file. * Removing watch file. * Adding vcs fields to control file. * Upgrading package to standards 3.8.0. * Upgrading package to debhelper 7. -- Daniel Baumann Wed, 02 Jul 2008 14:29:00 +0200 libixp (0.4-2) unstable; urgency=low * Bumped to new policy. * Don't hide make errors in clean target of rules. -- Daniel Baumann Sun, 23 Dec 2007 16:18:00 +0100 libixp (0.4-1) unstable; urgency=low * New upstream release. -- Daniel Baumann Sun, 18 Nov 2007 17:33:00 +0100 libixp (0.3+20070518-1) unstable; urgency=low * New upstream snapshot. -- Daniel Baumann Fri, 18 May 2007 09:08:00 +0200 libixp (0.2+20070501-1) unstable; urgency=low * New upstream snapshot. -- Daniel Baumann Tue, 01 May 2007 09:04:00 +0200 libixp (0.2+20070405-1) unstable; urgency=low * New upstream snapshot. -- Daniel Baumann Thu, 05 Apr 2007 16:51:00 +0200 libixp (0.2-1) unstable; urgency=low * Initial release. -- Daniel Baumann Tue, 02 Jan 2007 17:52:00 +0100 debian/control0000664000000000000000000000253313260672112010576 0ustar Source: libixp Section: libs Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Andrew Shadura Build-Depends: debhelper (>= 9) Standards-Version: 3.9.3 Homepage: http://libixp.googlecode.com/ Vcs-Hg: http://anonscm.debian.org/hg/collab-maint/libixp/ Vcs-Browser: http://anonscm.debian.org/hg/collab-maint/libixp/summary Package: libixp Section: oldlibs Priority: extra Architecture: all Depends: libixp-dev, ${misc:Depends} Description: transitional dummy package for libixp-dev This is a transitional package to ease upgrades to the libixp-dev package. It can be safely removed. Package: libixp0 Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} Description: simple 9P client-/server-library This is a an extremely simple 9P stand-alone library. 9P is a virtual filesystem from the Plan9 operating system. Package: libixp-dev Section: libdevel Architecture: any Provides: libixp Breaks: libixp (<< 0.6~) Replaces: libixp (<< 0.6~) Depends: ${shlibs:Depends}, ${misc:Depends}, libixp0 (=${binary:Version}) Description: simple 9P client-/server-library (development) This is a an extremely simple 9P stand-alone library. 9P is a virtual filesystem from the Plan9 operating system. . This package contains the development library and its headers. debian/source/0000775000000000000000000000000011750602403010466 5ustar debian/source/format0000664000000000000000000000001411750602403011674 0ustar 3.0 (quilt) debian/source/options0000664000000000000000000000005111750602403012100 0ustar compression = gzip compression-level = 9 debian/get-orig-source.sh0000775000000000000000000000134012012642163012535 0ustar #!/bin/sh -e TARBALLDIR=${1:-.} UPSTREAM_REPO=https://code.google.com/p/libixp/ PACKAGE=libixp SRC_VERSION=$(dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p') SRC_REVISION=${SRC_VERSION##*hg} TARBALL=$(readlink -f "$TARBALLDIR/${PACKAGE}_${SRC_VERSION}.orig.tar.bz2") REPODIR="debian/orig-source/${PACKAGE}-${SRC_VERSION}.orig" if [ -e "$REPODIR" ] then echo "$REPODIR directory found, not removing. Aborted." exit 1 fi mkdir -p debian/orig-source echo "Cloning ${UPSTREAM_REPO}" hg clone "${UPSTREAM_REPO}" "$REPODIR" || exit 1 echo "Creating ${TARBALL} for revision $SRC_REVISION" cd "$REPODIR" hg archive -r "$SRC_REVISION" -X".hg*" "${TARBALL}" || exit 1 cd "$OLDPWD" rm -rf debian/orig-source debian/compat0000664000000000000000000000000212011227163010361 0ustar 9 debian/libixp-dev.manpages0000664000000000000000000000005311750602403012744 0ustar man/ixpc.1 debian/tmp/usr/share/man/man3/* debian/copyright0000664000000000000000000000477212246427556011152 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libixp Upstream-Contact: Kris Maglione Source: http://libixp.googlecode.com/ Files: * Copyright: (C) 2005-2006 Anselm R. Garbe (C) 2006-2011 Kris Maglione License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . 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 AUTHORS OR COPYRIGHT HOLDERS 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. Files: debian/* Copyright: (C) 2007-2010 Daniel Baumann (C) 2011-2013 Andrew Shadura License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . 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 AUTHORS OR COPYRIGHT HOLDERS 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.