[pkg-kolab] r658 - in kolabd/trunk/debian: . patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-07-30 14:13:12 +0000 (Mon, 30 Jul 2007)
New Revision: 658

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/patches/30-bootstrap.dpatch
Log:
* Fixed default hostname suggested by kolab_bootstrap

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2007-07-30 11:25:42 UTC (rev 657)
+++ kolabd/trunk/debian/changelog	2007-07-30 14:13:12 UTC (rev 658)
@@ -9,6 +9,7 @@
   * Raised Postfix dependencies to version 2.4
   * Revived kolab_bootstrap
   * Don't ignore errors from make distclean, as per lintian check
+  * Fixed default hostname suggested by kolab_bootstrap
 
  -- Peter Eisentraut <petere at debian.org>  Mon, 23 Jul 2007 12:46:38 +0200
 

Modified: kolabd/trunk/debian/patches/30-bootstrap.dpatch
===================================================================
--- kolabd/trunk/debian/patches/30-bootstrap.dpatch	2007-07-30 11:25:42 UTC (rev 657)
+++ kolabd/trunk/debian/patches/30-bootstrap.dpatch	2007-07-30 14:13:12 UTC (rev 658)
@@ -6,7 +6,7 @@
 @DPATCH@
 diff -urNad kolabd-2.1.0-20070510.dfsg~/kolab_bootstrap.in kolabd-2.1.0-20070510.dfsg/kolab_bootstrap.in
 --- kolabd-2.1.0-20070510.dfsg~/kolab_bootstrap.in	2007-02-11 15:47:51.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/kolab_bootstrap.in	2007-06-23 14:04:27.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/kolab_bootstrap.in	2007-07-30 13:44:24.000000000 +0200
 @@ -21,6 +21,7 @@
  use Net::LDAP::Entry;
  use Net::Netmask;
@@ -15,6 +15,37 @@
  use Getopt::Std;
  use Sys::Hostname;
  use Term::ReadKey;
+@@ -49,19 +50,19 @@
+ sub myhostname {
+   my $host = '';
+   # FIXME: hardcoded - maybe fixed later
+-  if( open( HOSTNAME, '/etc/HOSTNAME' ) ) {
+-    $host = <HOSTNAME>;
+-    chomp $host;
+-    close( HOSTNAME );
+-  }
++#  if( open( HOSTNAME, '/etc/HOSTNAME' ) ) {
++#    $host = <HOSTNAME>;
++#    chomp $host;
++#    close( HOSTNAME );
++#  }
+   # FIXME: hardcoded - maybe fixed later
+-  if( open( HOSTNAME, '/etc/hostname' ) ) {
+-    $host = <HOSTNAME>;
+-    chomp $host;
+-    close( HOSTNAME );
+-  }
++#  if( open( HOSTNAME, '/etc/hostname' ) ) {
++#    $host = <HOSTNAME>;
++#    chomp $host;
++#    close( HOSTNAME );
++#  }
+   if( $host eq '' ) {
+-    $host = `hostname`;
++    $host = `hostname --fqdn`;
+   }
+   return $host;
+ }
 @@ -90,7 +91,7 @@
      print ("Error: Found $name running on Port $port\n");
      print ("Check your installation!\n");