--- libebox-0.11.99.orig/debian/copyright +++ libebox-0.11.99/debian/copyright @@ -0,0 +1,22 @@ +This package was debianized by Isaac Clerencia on +Fri, 20 Aug 2004 14:10:24 +0100. + +It was downloaded from http://www.warp.es/ + +Upstream Author: Warp Networks S.L. + +Copyright (C) 2004 Warp Networks S.L. + +License: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License + for more details. + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL file. --- libebox-0.11.99.orig/debian/dirs +++ libebox-0.11.99/debian/dirs @@ -0,0 +1,6 @@ +usr/share/ebox/ +etc/ebox/ +var/lib/ebox/ +var/lib/ebox/conf +var/lib/ebox/tmp +var/lib/ebox/log --- libebox-0.11.99.orig/debian/control +++ libebox-0.11.99/debian/control @@ -0,0 +1,19 @@ +Source: libebox +Section: web +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Javier Uruen Val +Build-Depends: debhelper (>= 5.0.0), cdbs, dpatch +Standards-Version: 3.7.3 + +Package: libebox +Architecture: all +Depends: sudo, iproute, liblog-dispatch-perl, liblog-log4perl-perl, libhtml-mason-perl, liblocale-gettext-perl, liberror-perl, libdevel-stacktrace-perl, libintl-perl, libnet-ip-perl, gettext, libfile-slurp-perl, libreadonly-perl, libreadonly-xs-perl, libperl6-junction-perl, libmail-rfc822-address-perl +Replaces: ebox (<< 0.6) +Conflicts: ebox (<< 0.11.99) +Description: eBox common library for server and client + eBox is a framework for the development and deployment of security-wise + network services in small and medium-sized networks, offering a simplified + graphical interface to non expert users. + . + http://projects.warp.es/ebox/ --- libebox-0.11.99.orig/debian/changelog +++ libebox-0.11.99/debian/changelog @@ -0,0 +1,123 @@ +libebox (0.11.99-0ubuntu3.8.10.1) intrepid-proposed; urgency=low + + [ Adam Sommer ] + * debian/patches/05_dbus_gconf.dpatch + - Patch to support the new gconf version using dbus. (LP: #314606) + - Adjust regex in Config.pm.in for new dbus configuration. + + -- Mathias Gug Mon, 09 Feb 2009 18:57:52 -0500 + +libebox (0.11.99-0ubuntu3) hardy; urgency=low + + * debian/patches/04_disable_debug.dpatch + - Disable debug information so that it does not disclose + information. (LP: #219343) + + -- Chuck Short Mon, 21 Apr 2008 08:28:10 -0400 + +libebox (0.11.99-0ubuntu2) hardy; urgency=low + + * debian/control, + debian/rules, + debian/patches/01_set_multiple_groups.dpatch, + debian/patches/02_fix_interpolation_warning.dpatch, + debian/patches/03_abstract_daemon_tmp_dir.dpatch + - Updated with patches from upstream. + + -- Chuck Short Tue, 11 Mar 2008 09:10:47 -0400 + +libebox (0.11.99-0ubuntu1) hardy; urgency=low + + * New upstream release. + + -- Chuck Short Wed, 27 Feb 2008 13:19:28 -0500 + +libebox (0.11.99-0ubuntu1~ppa1) hardy; urgency=low + + * New upstream release + + -- Javier Uruen Val Mon, 25 Feb 2008 12:06:20 +0100 + +libebox (0.11.99) unstable; urgency=low + + * New upstream release + + -- Enrique José Hernández Blasco Tue, 8 Jan 2008 16:24:51 +0100 + +libebox (0.11-0ubuntu1~ppa1) hardy; urgency=low + + * New upstream release + + -- Javier Uruen Val Wed, 28 Nov 2007 15:23:40 +0100 + +libebox (0.10.99) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Thu, 01 Nov 2007 21:38:21 +0100 + +libebox (0.10) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Wed, 10 Oct 2007 21:54:38 +0200 + +libebox (0.9.100) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Mon, 03 Sep 2007 11:10:58 +0200 + +libebox (0.9.99) unstable; urgency=low + + * New upstream release + + -- Javier Amor Garcia Tue, 24 Jul 2007 13:06:39 +0200 + +libebox (0.9.3) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Sun, 24 Jun 2007 16:39:02 +0200 + +libebox (0.9.2) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Tue, 12 Jun 2007 19:00:16 +0200 + +libebox (0.9.1) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Tue, 15 May 2007 13:02:50 +0200 + +libebox (0.9) unstable; urgency=low + + * New upstream release + + -- Javier Amor Garcia Mon, 19 Mar 2007 12:03:48 +0100 + +libebox (0.8.99) unstable; urgency=low + + * New upstream release + + -- Enrique Jos� Hern�ndez Blasco Fri, 16 Feb 2007 11:45:49 +0100 + +libebox (0.7.99-1) unstable; urgency=low + + * New upstream release + + -- Javier Amor Garcia Wed, 8 Nov 2006 13:22:37 +0100 + +libebox (0.7.0.99-rc1+0.7.1-rc1) unstable; urgency=low + + * New upstream release + + -- Javier Uruen Val Tue, 17 Jan 2006 11:45:54 +0100 + +libebox (0.5.1) unstable; urgency=low + + * New upstream release + + -- Isaac Clerencia Thu, 3 Mar 2005 19:55:13 +0100 --- libebox-0.11.99.orig/debian/compat +++ libebox-0.11.99/debian/compat @@ -0,0 +1 @@ +5 --- libebox-0.11.99.orig/debian/libebox.postrm +++ libebox-0.11.99/debian/libebox.postrm @@ -0,0 +1,12 @@ +#!/bin/bash + +case "$1" in + purge) + #delete logs and temporary files when purging + rm -rf /var/lib/ebox/ + # delete ebox sysconfig + rm -rf /etc/ebox + ;; +esac + +#DEBHELPER# --- libebox-0.11.99.orig/debian/docs +++ libebox-0.11.99/debian/docs @@ -0,0 +1 @@ +README --- libebox-0.11.99.orig/debian/rules +++ libebox-0.11.99/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/dpatch/dpatch.make + +DEB_CONFIGURE_EXTRA_FLAGS := --disable-runtime-tests + +clean:: + rm -f config.status --- libebox-0.11.99.orig/debian/patches/00list +++ libebox-0.11.99/debian/patches/00list @@ -0,0 +1,5 @@ +01_set_multiple_groups +02_fix_interpolation_warning +03_abstract_daemon_tmp_dir +04_disable_debug +05_dbus_gconf.dpatch --- libebox-0.11.99.orig/debian/patches/04_disable_debug.dpatch +++ libebox-0.11.99/debian/patches/04_disable_debug.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_disable_debug.dpatch by Javier Uruen Val +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Disable debug by default + +@DPATCH@ + +Index: libebox/conf/99ebox.conf +=================================================================== +--- libebox/conf/99ebox.conf (revisión: 9984) ++++ libebox/conf/99ebox.conf (copia de trabajo) +@@ -28,7 +28,7 @@ + group = adm + + # debug mode [required]. yes|no +-debug = yes ++debug = no + + # default error cgi + default_error_cgi = EBox::CGI::Base --- libebox-0.11.99.orig/debian/patches/03_abstract_daemon_tmp_dir.dpatch +++ libebox-0.11.99/debian/patches/03_abstract_daemon_tmp_dir.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_abstract_daemon_tmp_dir.dpatch by Javier Uruen Val +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to backport 0.11.100 fix to make abstract daemon use ebox tmp +## DP: directory + +@DPATCH@ + +Index: src/EBox/AbstractDaemon.pm +=================================================================== +--- libebox/src/EBox/AbstractDaemon.pm (.../ubuntu-hardy-0.11.99/common/libebox) (revisión: 9785) ++++ libebox/src/EBox/AbstractDaemon.pm (.../ubuntu-0.11.99/common/libebox) (revisión: 9785) +@@ -81,11 +81,11 @@ + + foreach my $fd (0 .. 64) { POSIX::close($fd); } + +- +- open(STDIN, "+/tmp/stdout"); +- open(STDERR, "+>/tmp/stderr"); ++ open(STDOUT, "+>$tmp/stout"); ++ open(STDERR, "+>$tmp/stderr"); + } --- libebox-0.11.99.orig/debian/patches/05_dbus_gconf.dpatch +++ libebox-0.11.99/debian/patches/05_dbus_gconf.dpatch @@ -0,0 +1,76 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_dbus_gconf.dpatch by Javier Uruen Val +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to support the new gconf version using dbus + +@DPATCH@ +diff -urNad libebox-0.11.99~/src/EBox/Config.pm.in libebox-0.11.99/src/EBox/Config.pm.in +--- libebox-0.11.99~/src/EBox/Config.pm.in 2008-12-20 16:02:09.000000000 -0500 ++++ libebox-0.11.99/src/EBox/Config.pm.in 2008-12-20 16:02:09.000000000 -0500 +@@ -57,7 +57,7 @@ + $_ =~ s/\s//g; + $_ =~ s/#.*//g; + ($_ eq '') and next; +- my ($nkey, $nvalue) = $_ =~ /(.*)=(.*)/; ++ my ($nkey, $nvalue) = $_ =~ /(.*?)=(.*)/; + if ($nkey eq $key) { + $value = $nvalue; + last; +diff -urNad libebox-0.11.99~/src/EBox.pm libebox-0.11.99/src/EBox.pm +--- libebox-0.11.99~/src/EBox.pm 2008-12-20 16:02:09.000000000 -0500 ++++ libebox-0.11.99/src/EBox.pm 2008-12-20 16:05:59.000000000 -0500 +@@ -20,8 +20,10 @@ + + use EBox::Config; + use EBox::Exceptions::DeprecatedMethod; +-use POSIX qw(setuid setgid setlocale LC_ALL); + use English; ++use POSIX qw(setuid setgid setlocale LC_ALL LC_NUMERIC); ++ ++use constant DBUS_CMD => 'ebox-dbus-launch'; + + my $loginit = 0; + +@@ -118,6 +120,41 @@ + my $user = EBox::Config::user(); + my $uid = getpwnam($user); + setuid($uid) or die "Cannot change user to $user"; ++ dbusInit(); + } ++ ++# Method: dbusInit ++# ++# Initialise a dbus daemon, if it's not already done. We store ++# one for root and one for eBox user. ++# ++# ++sub dbusInit ++{ ++ my $confFile; ++ if ( POSIX::getuid() == 0) { ++ $confFile = EBox::Config::conf() . 'dbus-root-session.conf'; ++ } else { ++ $confFile = EBox::Config::conf() . 'dbus-ebox-session.conf'; ++ } ++ my ($dbusAddress, $dbusDaemonPid, $launchNew) = (0, 0, 1); ++ ++ if ( -r $confFile ) { ++ $dbusAddress = EBox::Config::configkeyFromFile( ++ 'DBUS_SESSION_BUS_ADDRESS', $confFile); ++ $dbusDaemonPid = EBox::Config::configkeyFromFile( ++ 'DBUS_SESSION_BUS_PID', $confFile); ++ } ++ ++ # TODO: dbus-send would be cooler than kill ++ unless ( $dbusDaemonPid and (kill 0, $dbusDaemonPid) ) { ++ system( EBox::Config::pkgdata() . DBUS_CMD . " $confFile"); ++ chmod(0660, $confFile); ++ $dbusAddress = EBox::Config::configkeyFromFile('DBUS_SESSION_BUS_ADDRESS', $confFile); ++ } ++ ++ $ENV{DBUS_SESSION_BUS_ADDRESS} = $dbusAddress; ++} ++ + + 1; --- libebox-0.11.99.orig/debian/patches/02_fix_interpolation_warning.dpatch +++ libebox-0.11.99/debian/patches/02_fix_interpolation_warning.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_fix_interpolation_warning.dpatch by Javier Uruen Val +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to backport 0.11.100 fix to remove interpolation warning + +@DPATCH@ + +Index: src/EBox/Exceptions/Command.pm +=================================================================== +--- libebox/src/EBox/Exceptions/Command.pm (.../ubuntu-hardy-0.11.99/common/libebox) (revisión: 9785) ++++ libebox/src/EBox/Exceptions/Command.pm (.../ubuntu-0.11.99/common/libebox) (revisión: 9785) +@@ -99,6 +99,8 @@ + my $errorStr = join ' ', @{ $error }; + my $outputStr = join ' ', @{ $output }; + ++ $cmdType = '' unless defined($cmdType); ++ + return "$cmdType $cmd failed. \nError output: $errorStr\nCommand output: $outputStr. \nExit value: $exitValue"; + } --- libebox-0.11.99.orig/debian/patches/01_set_multiple_groups.dpatch +++ libebox-0.11.99/debian/patches/01_set_multiple_groups.dpatch @@ -0,0 +1,127 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_set_multiple_groups.dpatch by Javier Uruen Val +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to backport 0.11.100 fix to allow ebox to use different groups +## DP: such as ebox, adm, lp... + +@DPATCH@ + +Index: conf/99ebox.conf +=================================================================== +--- libebox/conf/99ebox.conf (.../ubuntu-hardy-0.11.99/common/libebox) (revisión: 9785) ++++ libebox/conf/99ebox.conf (.../ubuntu-0.11.99/common/libebox) (revisión: 9785) +@@ -21,9 +21,12 @@ + # distribution. + user = ebox + +-# group [required]. The group under which ebox will run. +-group = ebox ++# egroup [required]. The group under which ebox will run. ++egroup = ebox + ++# group [optional]. Additional groups ++group = adm ++ + # debug mode [required]. yes|no + debug = yes + +Index: src/EBox.pm +=================================================================== +--- libebox/src/EBox.pm (.../ubuntu-hardy-0.11.99/common/libebox) (revisión: 9785) ++++ libebox/src/EBox.pm (.../ubuntu-0.11.99/common/libebox) (revisión: 9785) +@@ -21,6 +21,7 @@ + use EBox::Config; + use EBox::Exceptions::DeprecatedMethod; + use POSIX qw(setuid setgid setlocale LC_ALL); ++use English; + + my $loginit = 0; + +@@ -105,13 +106,18 @@ + + sub init + { +- POSIX::setlocale(LC_ALL, EBox::locale()); +- my $user = EBox::Config::user(); +- my $group = EBox::Config::group(); +- my $uid = getpwnam($user); +- my $gid = getgrnam($group); +- setgid($gid) or die "Cannot change group to $group"; +- setuid($uid) or die "Cannot change user to $user"; ++ POSIX::setlocale(LC_ALL, EBox::locale()); ++ ++ my @groups = @{EBox::Config::groups()}; ++ my $gids = ''; ++ for my $group (@groups) { ++ $gids .= getgrnam($group) . ' '; ++ } ++ $GID = $EGID = getgrnam(EBox::Config::group()) . " $gids"; ++ ++ my $user = EBox::Config::user(); ++ my $uid = getpwnam($user); ++ setuid($uid) or die "Cannot change user to $user"; + } + + 1; +Index: src/EBox/Config.pm.in +=================================================================== +--- libebox/src/EBox/Config.pm.in (.../ubuntu-hardy-0.11.99/common/libebox) (revisión: 9785) ++++ libebox/src/EBox/Config.pm.in (.../ubuntu-0.11.99/common/libebox) (revisión: 9785) +@@ -81,6 +81,20 @@ + return $value; + } + ++sub configkeys # (key) ++{ ++ my $key = shift; ++ ++ my @conffiles = glob(EBox::Config::etc() . "[0-9][0-9]*.conf"); ++ ++ my @values; ++ foreach my $file (@conffiles){ ++ my $value = configkeyFromFile($key, $file); ++ push (@values, $value) if defined($value); ++ } ++ return \@values; ++} ++ + sub user + { + my $user = configkey('user'); +@@ -89,14 +103,31 @@ + return $user; + } + +-sub group ++sub groups + { +- my $user = configkey('group'); +- $user or throw EBox::Exceptions::External("The ebox group has not ". ++ my @values = @{configkeys('group')}; ++ @values or throw EBox::Exceptions::External("The ebox group has not ". + "been set in the config file."); +- return $user; ++ my @groups; ++ for my $group (@values) { ++ if ($group =~ m/:/) { ++ push (@groups, split(':', $group)); ++ } else { ++ push (@groups, $group); ++ } ++ } ++ ++ return \@groups; + } + ++sub group ++{ ++ my $value = configkey('egroup'); ++ $value or throw EBox::Exceptions::External("The ebox group has not ". ++ "been set in the config file."); ++ return $value; ++} ++ + sub home + { + my $user = user();