Commit 3b4ebbb6 authored by Tzafrir Cohen's avatar Tzafrir Cohen

Remove unused patches

Signed-off-by: Tzafrir Cohen's avatarTzafrir Cohen <tzafrir@debian.org>
parent 950ac206
Subject: also unload OSLEC (echo) on module unload
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Forwarded: no
This patch sets the DAHDI init.d script to also unload 'echo' (OSLEC)
in the 'stop' target. This adds to the default of unloading dahdi and
all of its dependent modules.
The package dahdi-linux includes 'echo' and with the default settings,
will attempts load 'echo', that does not depend on dahdi, and hence
will not be unloaded by default. Thus upgrading to a newer version (of
a newer build) may break.
This change will not be committed upstream, as OSLEC is not used there.
--- a/dahdi.init
+++ b/dahdi.init
@@ -40,7 +40,7 @@ DAHDI_DEV_TIMEOUT=20
# A list of modules to unload when stopping.
# All of their dependencies will be unloaded as well.
-DAHDI_UNLOAD_MODULES="dahdi"
+DAHDI_UNLOAD_MODULES="dahdi echo"
#
# Determine which kind of configuration we're using
Remove the dependency on the module File::Basename.
This provides the ability to run the scripts using a local modules
directory. While that ability is very handy with the source distribution
and in testing environments, it is useless on a Debian package.
It is removed in a (currently still failed) attempt to remove the
dependency on perl and depend on perl-base alone.
--- a/xpp/dahdi.cgi
+++ b/xpp/dahdi.cgi
@@ -6,8 +6,6 @@
# modify it under the same terms as Perl itself.
use strict;
-use File::Basename;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
use CGI::Pretty qw/:standard start_ul start_li start_div start_pre/;
use Dahdi;
--- a/xpp/dahdi_drivers
+++ b/xpp/dahdi_drivers
@@ -1,7 +1,5 @@
#! /usr/bin/perl -w
use strict;
-use File::Basename;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
use Dahdi::Hardware;
--- a/xpp/dahdi_genconf
+++ b/xpp/dahdi_genconf
@@ -8,8 +8,6 @@
# $Id: dahdi_genconf 5440 2008-12-05 00:24:09Z tzafrir $
#
use strict;
-use File::Basename;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
use Dahdi;
use Dahdi::Hardware;
--- a/xpp/dahdi_hardware
+++ b/xpp/dahdi_hardware
@@ -8,9 +8,7 @@
# $Id: dahdi_hardware 4484 2008-06-29 16:57:48Z tzafrir $
#
use strict;
-use File::Basename;
use Getopt::Std;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
use Dahdi;
use Dahdi::Span;
--- a/xpp/dahdi_registration
+++ b/xpp/dahdi_registration
@@ -8,8 +8,6 @@
# $Id: dahdi_registration 4533 2008-07-03 08:22:02Z tzafrir $
#
use strict;
-use File::Basename;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
use Dahdi;
use Dahdi::Span;
--- a/xpp/lsdahdi
+++ b/xpp/lsdahdi
@@ -8,8 +8,6 @@
# $Id: lsdahdi 4764 2008-08-12 10:21:53Z tzafrir $
#
use strict;
-use File::Basename;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
use Dahdi;
use Dahdi::Span;
--- a/xpp/xpp_blink
+++ b/xpp/xpp_blink
@@ -8,8 +8,6 @@
# $Id: xpp_blink 4416 2008-06-19 17:34:36Z tzafrir $
#
use strict;
-use File::Basename;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
use Dahdi;
use Dahdi::Span;
--- a/xpp/xpp_sync
+++ b/xpp/xpp_sync
@@ -8,8 +8,6 @@
# $Id: xpp_sync 4484 2008-06-29 16:57:48Z tzafrir $
#
use strict;
-use File::Basename;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
use Dahdi::Xpp;
use Dahdi::Xpp::Xbus;
Description: proper dahdi permissions as in Debian
Author: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
In Debian DAHDI devices are owned by root:comm rather than
asterisk:asterisk.
Note that those rules are duplication of the rules in dahdi-linux. But
this file is probably a better place for them.
--- a/dahdi.rules
+++ b/dahdi.rules
@@ -1,4 +1,4 @@
# DAHDI devices with ownership/permissions for running as non-root
-SUBSYSTEM=="dahdi", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+SUBSYSTEM=="dahdi", GROUP="comm", MODE="0660"
SUBSYSTEM=="dahdi_devices", RUN="/usr/share/dahdi/handle_device"
SUBSYSTEM=="dahdi_spans", RUN="/usr/share/dahdi/span_config"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment