Subversion Repositories pmk

Compare Revisions

Ignore whitespace Rev 4 → Rev 3

/tags/0.10.1-1/debian/pmk.docs
File deleted
/tags/0.10.1-1/debian/README.Debian
File deleted
/tags/0.10.1-1/debian/control
File deleted
/tags/0.10.1-1/debian/pmk.manpages
File deleted
/tags/0.10.1-1/debian/compat
File deleted
/tags/0.10.1-1/debian/pmk.examples
File deleted
/tags/0.10.1-1/debian/watch
File deleted
/tags/0.10.1-1/debian/pmk.dirs
File deleted
/tags/0.10.1-1/debian/changelog
File deleted
/tags/0.10.1-1/debian/patches/00list
File deleted
/tags/0.10.1-1/debian/patches/20_manpages.dpatch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 0.10.1-1/debian/patches/25_pmksetup.dpatch
===================================================================
--- 0.10.1-1/debian/patches/25_pmksetup.dpatch (revision 4)
+++ 0.10.1-1/debian/patches/25_pmksetup.dpatch (nonexistent)
@@ -1,213 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_pmksetup.dpatch by Magnus Holmgren <magnus@kibibyte.se>
-##
-## DP: Adds -s parameter to pmksetup, which outputs config to standard
-## DP: output, as well as -g, which forces data gathering to take place
-## DP: immediately.
-
-@DPATCH@
-
---- pmk-0.10.1.orig/pmksetup.h
-+++ pmk-0.10.1/pmksetup.h
-@@ -85,7 +85,7 @@
- #define ECHO_NL "\\n"
- #define ECHO_HT "\\t"
-
--#define PMKSTP_OPT_STR "hr:u:vV" /* "a:hr:u:vV" */
-+#define PMKSTP_OPT_STR "ghr:su:vV" /* "a:hr:u:vV" */
-
- #define EMSG_PRIV_FMT "Failed to change privilege (%s)"
-
---- pmk-0.10.1.orig/pmksetup.c
-+++ pmk-0.10.1/pmksetup.c
-@@ -66,6 +66,7 @@
- extern int optind;
-
- FILE *sfp; /* scratch file pointer */
-+bool tostdout = false;
- char sfn[MAXPATHLEN]; /* scratch file name */
-
- htable *ht;
-@@ -154,7 +155,7 @@
- ***********************************************************************/
-
- bool gather_data(htable *pht) {
-- printf("==> Looking for default parameters...\n");
-+ fprintf(stderr, "==> Looking for default parameters...\n");
-
- /* gather env variables */
- if (get_env_vars(pht) == false) {
-@@ -850,7 +851,7 @@
- vsnprintf(buf, sizeof(buf), fmt, plst);
- va_end(plst);
-
-- printf("%s\n", buf);
-+ fprintf(stderr, "%s\n", buf);
- }
- }
-
-@@ -883,6 +884,13 @@
- optind = 1;
- while ((ch = getopt(argc, argv, PMKSTP_OPT_STR)) != -1) {
- switch(ch) {
-+ case 'g' :
-+ if (gather_data(ht) == false)
-+ return(false);
-+
-+ process_clopts = true;
-+ break;
-+
- case 'r' :
- /* mark to be deleted in hash */
- if (record_data(ht, optarg, PMKSTP_REC_REMV, NULL) == false) {
-@@ -932,6 +940,7 @@
- process_clopts = true;
- break;
-
-+ case 's' :
- case 'v' :
- case 'V' :
- /*
-@@ -949,11 +958,11 @@
- argc -= optind;
- argv += optind;
-
-- printf("PMKSETUP version %s", PREMAKE_VERSION);
-+ fprintf(stderr, "PMKSETUP version %s", PREMAKE_VERSION);
- #ifdef DEBUG
-- printf(" [SUB #%s] [SNAP #%s]", PREMAKE_SUBVER_PMKSETUP, PREMAKE_SNAP);
-+ fprintf(stderr, " [SUB #%s] [SNAP #%s]", PREMAKE_SUBVER_PMKSETUP, PREMAKE_SNAP);
- #endif /* DEBUG */
-- printf("\n\n");
-+ fprintf(stderr, "\n\n");
-
- if (process_clopts == false) {
- /* standard behavior, gathering data */
-@@ -967,7 +976,7 @@
- /* switch backup flag */
- cfg_backup = true;
-
-- printf("==> Configuration file found: %s\n",
-+ fprintf(stderr, "==> Configuration file found: %s\n",
- PREMAKE_CONFIG_PATH);
- if (parse_pmkconf(config, ht, PRS_PMKCONF_SEP,
- check_opt) == false) {
-@@ -978,10 +987,10 @@
- fclose(config);
- }
- } else {
-- printf("==> Configuration file not found.\n");
-+ fprintf(stderr, "==> Configuration file not found.\n");
- }
-
-- printf("==> Merging remaining data...\n");
-+ fprintf(stderr, "==> Merging remaining data...\n");
- /* writing the remaining data stored in the hash */
- if (write_new_data(ht) == false)
- return(false);
-@@ -1099,6 +1108,9 @@
- /* if child status is ok, writing changes */
- if (status == 0) {
- #endif
-+ if (tostdout) {
-+ return;
-+ }
- /*
- * check if pmk.conf already exists
- * NOTE: no race condition here for access(), BUT
-@@ -1106,7 +1118,7 @@
- */
- if (access(PREMAKE_CONFIG_PATH, F_OK) == 0) { /* see above */
- /* backup configuration file */
-- printf("==> Backing up configuration file: %s\n",
-+ fprintf(stderr, "==> Backing up configuration file: %s\n",
- PREMAKE_CONFIG_PATH_BAK);
-
- if (rename(PREMAKE_CONFIG_PATH,
-@@ -1118,7 +1130,7 @@
- }
-
- /* copying the temporary config to the system one */
-- printf("==> Saving configuration file: %s\n",
-+ fprintf(stderr, "==> Saving configuration file: %s\n",
- PREMAKE_CONFIG_PATH);
- if (fcopy(sfn, PREMAKE_CONFIG_PATH,
- PREMAKE_CONFIG_MODE) == false) {
-@@ -1165,7 +1177,7 @@
- ***********************************************************************/
-
- void usage(void) {
-- fprintf(stderr, "usage: pmksetup [-hVv] "
-+ fprintf(stderr, "usage: pmksetup [-hsVv] "
- "[-r variable] [-u variable=value]\n");
- exit(EXIT_FAILURE);
- }
-@@ -1188,6 +1200,7 @@
- optind = 1;
- while ((ch = getopt(argc, argv, PMKSTP_OPT_STR)) != -1) {
- switch(ch) {
-+ case 'g' :
- case 'r' :
- case 'u' :
- /*
-@@ -1206,6 +1219,10 @@
- verbose_flag = 1;
- break;
-
-+ case 's':
-+ tostdout = true;
-+ break;
-+
- case '?' :
- default :
- usage();
-@@ -1213,7 +1230,6 @@
- }
- }
-
--
- if (getuid() == 0) {
- #ifdef PMKSETUP_DEBUG
- debugf("PRIVSEP_USER = '%s'", PRIVSEP_USER);
-@@ -1227,22 +1243,27 @@
- gid = pw->pw_gid;
- }
-
-- /* check if syconfdir exists */
-- if (access(CONFDIR, F_OK) != 0) { /* no race condition, just mkdir() */
-- verbosef("==> Creating '%s' directory.", CONFDIR);
-- if (mkdir(CONFDIR, S_IRWXU | S_IRGRP | S_IXGRP |
-- S_IROTH | S_IXOTH) != 0) {
-- errorf("cannot create '%s' directory : %s.",
-- CONFDIR, strerror(errno));
-- exit(EXIT_FAILURE);
-- }
-+ if (tostdout) {
-+ sfp = stdout;
- }
-+ else {
-+ /* check if syconfdir exists */
-+ if (access(CONFDIR, F_OK) != 0) { /* no race condition, just mkdir() */
-+ verbosef("==> Creating '%s' directory.", CONFDIR);
-+ if (mkdir(CONFDIR, S_IRWXU | S_IRGRP | S_IXGRP |
-+ S_IROTH | S_IXOTH) != 0) {
-+ errorf("cannot create '%s' directory : %s.",
-+ CONFDIR, strerror(errno));
-+ exit(EXIT_FAILURE);
-+ }
-+ }
-
-- sfp = tmp_open(PREMAKE_CONFIG_TMP, "w", sfn, sizeof(sfn));
-- if (sfp == NULL) {
-- errorf("cannot open temporary file '%s' : %s.",
-- sfn, strerror(errno));
-- exit(EXIT_FAILURE);
-+ sfp = tmp_open(PREMAKE_CONFIG_TMP, "w", sfn, sizeof(sfn));
-+ if (sfp == NULL) {
-+ errorf("cannot open temporary file '%s' : %s.",
-+ sfn, strerror(errno));
-+ exit(EXIT_FAILURE);
-+ }
- }
-
- #ifndef WITHOUT_FORK
/0.10.1-1/debian/patches/25_pmksetup.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 0.10.1-1/debian/patches/20_build_fixes.dpatch
===================================================================
--- 0.10.1-1/debian/patches/20_build_fixes.dpatch (revision 4)
+++ 0.10.1-1/debian/patches/20_build_fixes.dpatch (nonexistent)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_build_fixes.dpatch by Magnus Holmgren <magnus@kibibyte.se>
-##
-## DP: Fix minor errors in makefile and configuration script
-
-@DPATCH@
-
---- pmk-0.10.1.orig/Makefile.pmk
-+++ pmk-0.10.1/Makefile.pmk
-@@ -52,7 +52,7 @@
- #
- # list of generated files
- #
--GEN_FILES= Makefile Makefile compat/config.h
-+GEN_FILES= Makefile tests/Makefile compat/config.h
-
- #
- # source dependency lists
---- pmk-0.10.1.orig/pmkcfg.sh
-+++ pmk-0.10.1/pmkcfg.sh
-@@ -406,7 +406,7 @@
- fi
- mkf_sed 'CONFDIR' '$(SYSCONFDIR)/pmk'
- mkf_sed 'SBINDIR' '$(PREFIX)/sbin'
-- mkf_sed 'DATADIR' '$(PREFIX)/share/$(PREMAKE)'
-+ mkf_sed 'DATADIR' '$(PREFIX)/share/pmk'
- fi
-
- mkf_sed 'BINDIR' '$(PREFIX)/bin'
/0.10.1-1/debian/patches/20_build_fixes.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 0.10.1-1/debian/copyright
===================================================================
--- 0.10.1-1/debian/copyright (revision 4)
+++ 0.10.1-1/debian/copyright (nonexistent)
@@ -1,37 +0,0 @@
-This package was debianized by Marek Habersack <grendel@debian.org> on
-Tue, 24 Jun 2003 22:08:41 +0200.
-
-It was downloaded from http://premk.sf.net/
-
-Upstream Author: Damien Couderc <mipsator@users.sourceforge.net>
-
-Copyright:
-
- This program is distributed under the terms of a BSD-like license:
-
- Copyright (c) 2003 Damien Couderc
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
Index: 0.10.1-1/debian/pmk.files
===================================================================
--- 0.10.1-1/debian/pmk.files (revision 4)
+++ 0.10.1-1/debian/pmk.files (nonexistent)
@@ -1 +0,0 @@
-usr/share/pmk/*
Index: 0.10.1-1/debian/pmk.postinst
===================================================================
--- 0.10.1-1/debian/pmk.postinst (revision 4)
+++ 0.10.1-1/debian/pmk.postinst (nonexistent)
@@ -1,55 +0,0 @@
-#! /bin/sh
-# postinst script for pmk
-#
-# see: dh_installdeb(1)
-
-conffile=/etc/pmk/pmk.conf
-
-set -e
-
-if [ -e /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
-fi
-
-case "$1" in
- configure|reconfigure)
- # Note that -s and -g are added by 25_pmksetup.dpatch;
- # they are not documented in pmksetup(8).
- tempfile=`mktemp -t pmksetup.XXXXXXXXXX`
- if pmksetup -s -g \
- -u PREFIX=\"/usr\" \
- -u BIN_CC=\"/usr/bin/gcc\" \
- -u BIN_CXX=\"/usr/bin/g++\" \
- -u PATH_BIN=\"/usr/local/bin:/usr/bin:/bin\" \
- -u OS_ARCH=\"`dpkg --print-architecture`\" \
- 2> /dev/null > $tempfile;
- then
- ucf --three-way --debconf-ok $tempfile $conffile
- rm -f $tempfile
- ucfr pmk $conffile
- else
- rm -f $tempfile
- exit 1
- fi
-
- # Clean out any remains of this package from the Debconf database
- if [ -e /usr/share/debconf/confmodule ]; then
- db_purge
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Index: 0.10.1-1/debian/rules
===================================================================
--- 0.10.1-1/debian/rules (revision 4)
+++ 0.10.1-1/debian/rules (nonexistent)
@@ -1,87 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
-CFLAGS = -pipe -Wall -g -DTMPDIR=\"\\\"/tmp\\\"\"
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- LDFLAGS = -s
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-# Overrides for the PMK Makefile stuff
-CC=gcc
-DESTDIR=$(CURDIR)/debian/pmk
-
-export CFLAGS LDFLAGS CC
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- ./pmkcfg.sh -p /usr
- touch configure-stamp
-
-build: build-stamp
-build-stamp: patch configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
- rm -f configure-stamp
- dh_clean
-
-install: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/pmk.
- $(MAKE) install DESTDIR=$(DESTDIR) MANDIR=/usr/share/man
-
-binary-indep: install
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs Changelog
- dh_installdocs
- dh_installexamples
- dh_installman
- find $(DESTDIR)/usr/share/man -type f | \
- xargs -r sed -i -e '/^\.Bd/,/^\.Ed/b' \
- -e '/^\(\.Ed\)\?$$/d'
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- chmod -x $(DESTDIR)/usr/share/doc/pmk/examples/tests/plang_test.c
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
/0.10.1-1/debian/rules
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 0.10.1-1/debian/pmk.postrm
===================================================================
--- 0.10.1-1/debian/pmk.postrm (revision 4)
+++ 0.10.1-1/debian/pmk.postrm (nonexistent)
@@ -1,37 +0,0 @@
-#!/bin/sh
-# postrm script for pmk
-#
-# see: dh_installdeb(1)
-
-conffile=/etc/pmk/pmk.conf
-
-set -e
-
-case "$1" in
- purge)
- rm -f $conffile $conffile~ $conffile.bak \#$conffile\# \
- $conffile.ucf-new $conffile.ucf-old $conffile.ucf-dist
- if which ucf >/dev/null; then
- ucf --purge /etc/pmk.conf
- fi
- if which ucfr >/dev/null; then
- ucfr --purge pmk /etc/pmk.conf
- fi
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
Index: 0.10.1-1/debian
===================================================================
--- 0.10.1-1/debian (revision 4)
+++ 0.10.1-1/debian (nonexistent)
/0.10.1-1/debian
Property changes:
Deleted: mergeWithUpstream
## -1 +0,0 ##
-1
\ No newline at end of property