Mailinglist Archive: opensuse-commit (1191 mails)

< Previous Next >
commit yast2-dhcp-server
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 02 Aug 2008 01:48:58 +0200
  • Message-id: <20080801234858.CFCD8678178@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-dhcp-server
checked in at Sat Aug 2 01:48:58 CEST 2008.


--------
--- yast2-dhcp-server/yast2-dhcp-server.changes 2008-05-16 21:49:34.000000000
+0200
+++ yast2-dhcp-server/yast2-dhcp-server.changes 2008-08-01 10:41:38.000000000
+0200
@@ -1,0 +2,6 @@
+Fri Aug 1 10:24:10 CEST 2008 - juhliarik@xxxxxxx
+
+- update dhcp-server depend on LDAP changes
+- 2.17.0
+
+-------------------------------------------------------------------



Old:
----
yast2-dhcp-server-2.16.7.tar.bz2

New:
----
yast2-dhcp-server-2.17.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.I25625/_old 2008-08-02 01:48:20.000000000 +0200
+++ /var/tmp/diff_new_pack.I25625/_new 2008-08-02 01:48:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dhcp-server (Version 2.16.7)
+# spec file for package yast2-dhcp-server (Version 2.17.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@


Name: yast2-dhcp-server
-Version: 2.16.7
-Release: 33
+Version: 2.17.0
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dhcp-server-2.16.7.tar.bz2
+Source0: yast2-dhcp-server-2.17.0.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1
perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2
yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite
Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN
yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
@@ -41,7 +41,7 @@
Lukas Ocilka <locilka@xxxxxxx>

%prep
-%setup -n yast2-dhcp-server-2.16.7
+%setup -n yast2-dhcp-server-2.17.0

%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,9 @@
%doc %{prefix}/share/doc/packages/yast2-dhcp-server
/usr/share/YaST2/schema/autoyast/rnc/dhcp-server.rnc
%changelog
+* Fri Aug 01 2008 juhliarik@xxxxxxx
+- update dhcp-server depend on LDAP changes
+- 2.17.0
* Fri May 16 2008 jsrain@xxxxxxx
- added categories Settings and System into desktop file
(bnc #382778)

++++++ yast2-dhcp-server-2.16.7.tar.bz2 -> yast2-dhcp-server-2.17.0.tar.bz2
++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/aclocal.m4
new/yast2-dhcp-server-2.17.0/aclocal.m4
--- old/yast2-dhcp-server-2.16.7/aclocal.m4 2008-05-19 19:58:48.000000000
+0200
+++ new/yast2-dhcp-server-2.17.0/aclocal.m4 2008-08-01 10:07:39.000000000
+0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-

# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.

-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically
`autoreconf'.])])

-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])

@@ -47,8 +50,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

@@ -141,13 +146,13 @@
# Do all the work for Automake. -*- Autoconf -*-

# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

-# serial 12
+# serial 13

# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -252,16 +257,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg"
`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -498,7 +504,7 @@

# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/agents/Makefile.in
new/yast2-dhcp-server-2.17.0/agents/Makefile.in
--- old/yast2-dhcp-server-2.16.7/agents/Makefile.in 2008-05-19
19:58:49.000000000 +0200
+++ new/yast2-dhcp-server-2.17.0/agents/Makefile.in 2008-08-01
10:07:42.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/config.guess
new/yast2-dhcp-server-2.17.0/config.guess
--- old/yast2-dhcp-server-2.16.7/config.guess 2008-05-19 19:58:49.000000000
+0200
+++ new/yast2-dhcp-server-2.17.0/config.guess 2008-08-01 10:07:41.000000000
+0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.

-timestamp='2006-07-02'
+timestamp='2008-01-08'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)

Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -171,6 +171,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -339,7 +340,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -541,7 +542,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk
'{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1;
then
IBM_ARCH=rs6000
@@ -790,7 +791,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -800,12 +801,18 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -839,10 +846,17 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
@@ -960,6 +974,9 @@
x86_64:Linux:*:*)
echo x86_64-${VENDOR}-linux-gnu
exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1218,6 +1235,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/config.sub
new/yast2-dhcp-server-2.17.0/config.sub
--- old/yast2-dhcp-server-2.16.7/config.sub 2008-05-19 19:58:49.000000000
+0200
+++ new/yast2-dhcp-server-2.17.0/config.sub 2008-08-01 10:07:41.000000000
+0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.

-timestamp='2006-09-20'
+timestamp='2008-01-16'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -475,8 +487,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -683,6 +703,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -925,6 +957,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1014,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1219,7 +1258,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1453,9 @@
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/configure.in
new/yast2-dhcp-server-2.17.0/configure.in
--- old/yast2-dhcp-server-2.16.7/configure.in 2008-05-19 19:58:46.000000000
+0200
+++ new/yast2-dhcp-server-2.17.0/configure.in 2008-08-01 10:07:35.000000000
+0200
@@ -1,6 +1,6 @@
dnl configure.in for yast2-dhcp-server
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

AC_INIT(yast2-dhcp-server, 2.16.7, http://bugs.opensuse.org/,
yast2-dhcp-server)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/doc/autodocs/Makefile.in
new/yast2-dhcp-server-2.17.0/doc/autodocs/Makefile.in
--- old/yast2-dhcp-server-2.16.7/doc/autodocs/Makefile.in 2008-05-19
19:58:49.000000000 +0200
+++ new/yast2-dhcp-server-2.17.0/doc/autodocs/Makefile.in 2008-08-01
10:07:42.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/doc/Makefile.in
new/yast2-dhcp-server-2.17.0/doc/Makefile.in
--- old/yast2-dhcp-server-2.16.7/doc/Makefile.in 2008-05-19
19:58:49.000000000 +0200
+++ new/yast2-dhcp-server-2.17.0/doc/Makefile.in 2008-08-01
10:07:42.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -331,8 +331,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS

@@ -357,8 +357,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -368,13 +368,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/install-sh
new/yast2-dhcp-server-2.17.0/install-sh
--- old/yast2-dhcp-server-2.16.7/install-sh 2008-05-19 19:58:49.000000000
+0200
+++ new/yast2-dhcp-server-2.17.0/install-sh 2008-08-01 10:07:41.000000000
+0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile

-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00

# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
# set DOITPROG to echo to test this script

# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@
# Put in absolute file names if you don't have them in your path;
# or use environment vars.

-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'

-posix_glob=
posix_mkdir=

# Desired mode of installed file.
mode=0755

+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=

-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@
In the 4th, create DIRECTORIES.

Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification
time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.

Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"

while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
+
+ -C) copy_on_change=true;;

- -d) dir_arg=true
- shift
- continue;;
+ -d) dir_arg=true;;

-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;

--help) echo "$usage"; exit $?;;

-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;

-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t) dstarg=$2
- shift
- shift
- continue;;
-
- -T) no_target_directory=true
- shift
- continue;;
+ shift;;
+
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
+ shift;;
+
+ -T) no_target_directory=true;;

--version) echo "$0 $scriptversion"; exit $?;;

@@ -165,21 +170,22 @@

*) break;;
esac
+ shift
done

-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi

@@ -224,7 +230,7 @@
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac

if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@
exit 1
fi

- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi

- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac

# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@
# directory the slow way, step by step, checking for races as we go.

case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac

- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"

oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS

prefixes=
@@ -459,41 +458,54 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1

trap '' 0
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/Makefile.in
new/yast2-dhcp-server-2.17.0/Makefile.in
--- old/yast2-dhcp-server-2.16.7/Makefile.in 2008-05-19 19:58:50.000000000
+0200
+++ new/yast2-dhcp-server-2.17.0/Makefile.in 2008-08-01 10:07:42.000000000
+0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -389,8 +389,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS

@@ -415,8 +415,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -426,13 +426,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -505,6 +504,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)

+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -531,6 +534,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -687,10 +692,10 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
+ dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/src/DhcpServer.pm
new/yast2-dhcp-server-2.17.0/src/DhcpServer.pm
--- old/yast2-dhcp-server-2.16.7/src/DhcpServer.pm 2008-01-24
13:58:23.000000000 +0100
+++ new/yast2-dhcp-server-2.17.0/src/DhcpServer.pm 2008-08-01
10:00:38.000000000 +0200
@@ -391,12 +391,12 @@
my %record = %{ $found[0] || {}};

# determine type
- my @classes = @{ $record { "objectclass" } || [] };
+ my @classes = @{ $record { "objectClass" } || [] };

- if ( grep ( /dhcpOptions/, @classes ) && defined $record { "dhcpoption" } )
+ if ( grep ( /dhcpOptions/, @classes ) && defined $record { "dhcpOption" } )
{
# there are some options to gather
- my @opts = @{ $record { "dhcpoption" } };
+ my @opts = @{ $record { "dhcpOption" } };
foreach my $opt (@opts) {
# split by spaces
my @single = split (/ +/, $opt);
@@ -417,9 +417,9 @@
}
}

- if ( defined $record { "dhcpstatements" } )
+ if ( defined $record { "dhcpStatements" } )
{
- my @statements = @{ $record { "dhcpstatements" } };
+ my @statements = @{ $record { "dhcpStatements" } };
# there are some directives to gather
foreach my $stmt (@statements) {
# split by spaces
@@ -442,22 +442,22 @@
}

# now handle also special case statements
- if ( $type eq "host" && defined $record { "dhcphwaddress" } )
+ if ( $type eq "host" && defined $record { "dhcpHWAddress" } )
{
my %directive_rec = (
"key" => "hardware",
- "value" => $record { "dhcphwaddress" }->[0],
+ "value" => $record { "dhcpHWAddress" }->[0],
"type" => "directive",
"comment_before" => "",
"comment_after" => ""
);
push @directives, \%directive_rec;
}
- elsif ( ($type eq "pool" || $type eq "subnet" ) && defined $record {
"dhcprange" } )
+ elsif ( ($type eq "pool" || $type eq "subnet" ) && defined $record {
"dhcpRange" } )
{
my %directive_rec = (
"key" => "range",
- "value" => $record { "dhcprange" }->[0],
+ "value" => $record { "dhcpRange" }->[0],
"type" => "directive",
"comment_before" => "",
"comment_after" => ""
@@ -497,7 +497,7 @@
my $r_type = undef;

# determine type
- my @classes = @{ $child_record { "objectclass" } };
+ my @classes = @{ $child_record { "objectClass" } };

if ( grep ( /dhcpPool/, @classes ) )
{
@@ -533,7 +533,7 @@

if ($r_type eq "subnet")
{
- my @netmasks = @{ $child_record { "dhcpnetmask" } };
+ my @netmasks = @{ $child_record { "dhcpNetMask" } };
my $netmask = $netmasks[0];
$netmask = Netmask->FromBits ($netmask);
$r_id = "$r_id netmask $netmask";
@@ -650,12 +650,12 @@
@lval = grep { $_ ne ''; } @lval;
$val = join (" ", @lval);
$val = lc ($val);
- $to_save { "dhcphwaddress" } = $val;
+ $to_save { "dhcpHWAddress" } = $val;
}
elsif ( ($record { "type" } eq "pool" || $record { "type" } eq "subnet"
)
&& $r { "key" } eq "range" )
{
- $to_save { "dhcprange" } = $r { "value" };
+ $to_save { "dhcpRange" } = $r { "value" };
}
else
{
@@ -668,8 +668,8 @@
}
}

- $to_save { "dhcpoption" } = \@options;
- $to_save { "dhcpstatements" } = \@directives;
+ $to_save { "dhcpOption" } = \@options;
+ $to_save { "dhcpStatements" } = \@directives;

# now, add the type-specific options (required attributes)
if ( $record {"type"} eq "subnet" )
@@ -678,9 +678,9 @@
$record { "id" } =~ m/^\s*(\S+)\s+netmask\s+([^ \t]+)[ \t]*$/;
my $id = $1;
my $netmask = $2;
- $to_save { "dhcpnetmask" } = \@{ [ Netmask->ToBits ( $netmask ) ] };
+ $to_save { "dhcpNetMask" } = \@{ [ Netmask->ToBits ( $netmask ) ] };

- $to_save { "objectclass" } = \@{ [ "dhcpSubNet", "dhcpOptions", "top" ]
};
+ $to_save { "objectClass" } = \@{ [ "dhcpSubNet", "dhcpOptions", "top" ]
};
$to_save { "cn" } = \@{ [ $id ] };
}
elsif ( $record {"type"} eq "pool" )
@@ -688,7 +688,7 @@
$record { "id" } =~ m/^\s*(\S+)\s*$/;
my $id = $1;

- $to_save { "objectclass" } = \@{ [ "dhcpPool", "dhcpOptions", "top" ] };
+ $to_save { "objectClass" } = \@{ [ "dhcpPool", "dhcpOptions", "top" ] };
$to_save { "cn" } = \@{ [ $id ] };
}
elsif ( $record {"type"} eq "class" )
@@ -696,7 +696,7 @@
$record { "id" } =~ m/^\s*(\S+)\s*$/;
my $id = $1;

- $to_save { "objectclass" } = \@{ [ "dhcpClass", "dhcpOptions", "top" ]
};
+ $to_save { "objectClass" } = \@{ [ "dhcpClass", "dhcpOptions", "top" ]
};
$to_save { "cn" } = \@{ [ $id ] };
}
elsif ( $record {"type"} eq "host" )
@@ -704,7 +704,7 @@
$record { "id" } =~ m/^\s*(\S+)\s*$/;
my $id = $1;

- $to_save { "objectclass" } = \@{ [ "dhcpHost", "dhcpOptions", "top" ] };
+ $to_save { "objectClass" } = \@{ [ "dhcpHost", "dhcpOptions", "top" ] };
$to_save { "cn" } = \@{ [ $id ] };
}
elsif ( $record {"type"} eq "sharednetwork" )
@@ -712,7 +712,7 @@
$record { "id" } =~ m/^\s*(\S+)\s*$/;
my $id = $1;

- $to_save { "objectclass" } = \@{ [ "dhcpSharedNetwork", "dhcpOptions",
"top" ] };
+ $to_save { "objectClass" } = \@{ [ "dhcpSharedNetwork", "dhcpOptions",
"top" ] };
$to_save { "cn" } = \@{ [ $id ] };
}
elsif ( $record {"type"} eq "group" )
@@ -720,7 +720,7 @@
$record { "id" } =~ m/^\s*(\S+)\s*$/;
my $id = $1;

- $to_save { "objectclass" } = \@{ [ "dhcpGroup", "dhcpOptions", "top" ]
};
+ $to_save { "objectClass" } = \@{ [ "dhcpGroup", "dhcpOptions", "top" ]
};
$to_save { "cn" } = \@{ [ $id ] };
}
elsif ( $record {"type"} eq "")
@@ -728,8 +728,8 @@
$where_rec{"dn"} =~ m/cn=([^,]+),.*/;
my $root_cn = $1;
$to_save{"cn"} = $root_cn if (defined ($root_cn));
- $to_save{"objectclass"} = [ "dhcpService", "dhcpOptions", "top"];
- $to_save{"dhcpprimarydn"} = $dhcp_server_dn;
+ $to_save{"objectClass"} = [ "dhcpService", "dhcpOptions", "top"];
+ $to_save{"dhcpPrimaryDN"} = $dhcp_server_dn;
}

if ( $record {"type"} ne "" )
@@ -2482,7 +2482,7 @@
$dhcp_conf_dn = $keys[0];
%found = %{$found{$dhcp_conf_dn}};
# check if base DN for dhcp config is defined
- my @bases = @{ $found{"susedefaultbase"} || [] };
+ my @bases = @{ $found{"suseDefaultBase"} || [] };
if (@bases > 0)
{
$base_config_dn = $bases[0];
@@ -2530,12 +2530,12 @@
y2milestone ("Choosing server $dhcp_server_dn");
y2milestone ("Using LDAP server $dhcp_server_dn");
my %server_entry = %{ $servers{$dhcp_server_dn} };
- if (scalar (@{$server_entry{"dhcpservicedn"}}) > 1)
+ if (scalar (@{$server_entry{"dhcpServiceDN"}}) > 1)
{
# error report
Report->Error (__("Support for multiple dhcpServiceDN not
implemented."));
}
- $ldap_dhcp_config_dn = $server_entry{"dhcpservicedn"}[0];
+ $ldap_dhcp_config_dn = $server_entry{"dhcpServiceDN"}[0];
if (!(defined ($ldap_dhcp_config_dn) && $ldap_dhcp_config_dn =~
/\S+/))
{
# error report
@@ -2569,7 +2569,7 @@
}
else
{
- my $pri_dn = $found[0]{"dhcpprimarydn"}[0] || "";
+ my $pri_dn = $found[0]{"dhcpPrimaryDN"}[0] || "";
y2milestone ("Primary DN: $pri_dn");
if ($dhcp_server_dn ne $pri_dn)
{
@@ -2678,7 +2678,7 @@
my %ldap_object = (
'objectclass' => [ 'top', 'suseDhcpConfiguration' ],
'cn' => [ 'defaultDHCP' ],
- 'susedefaultbase' => [ $base_config_dn ],
+ 'suseDefaultBase' => [ $base_config_dn ],
);
my %ldap_request = (
"dn" => $dhcp_conf_dn
@@ -2707,11 +2707,11 @@
}

# check if base DN for dhcp config is defined
- my @bases = @{ $found{"susedefaultbase"} || [] };
+ my @bases = @{ $found{"suseDefaultBase"} || [] };
if (@bases == 0)
{
my %ldap_object = %found;
- $ldap_object{"susedefaultbase"} = [$base_config_dn];
+ $ldap_object{"suseDefaultBase"} = [$base_config_dn];
my %ldap_request = (
"dn" => "$dhcp_conf_dn",
);
@@ -2742,7 +2742,7 @@
if (@dhcps == 0)
{
my %ldap_object = (
- "objectclass" => [ "top", "organizationalUnit" ],
+ "objectClass" => [ "top", "organizationalUnit" ],
"ou" => [ "DHCP" ],
);
my %ldap_request = (
@@ -2779,8 +2779,8 @@
y2milestone ("DHCP server not found in LDAP, creating ".
$dhcp_server_dn);
my %server_entry = (
- "objectclass" => [ "top", "dhcpServer", "dhcpOptions" ],
- "dhcpservicedn" => [ $ldap_dhcp_config_dn ],
+ "objectClass" => [ "top", "dhcpServer", "dhcpOptions" ],
+ "dhcpServiceDN" => [ $ldap_dhcp_config_dn ],
"cn" => [ $dhcp_server ],
);
my %ldap_request = (
@@ -2815,9 +2815,9 @@
my @cn = split(/=/, shift (@ldap_config_dn_elements));
my $cn = $cn[1];
my %ldap_object = (
- "objectclass" => [ "top", "dhcpService", "dhcpOptions" ],
+ "objectClass" => [ "top", "dhcpService", "dhcpOptions" ],
"cn" => [ $cn ],
- "dhcpprimarydn" => [ "$dhcp_server_dn" ],
+ "dhcpPrimaryDN" => [ "$dhcp_server_dn" ],
);
my %ldap_request = (
"dn" => "$ldap_dhcp_config_dn",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/src/Makefile.in
new/yast2-dhcp-server-2.17.0/src/Makefile.in
--- old/yast2-dhcp-server-2.16.7/src/Makefile.in 2008-05-19
19:58:49.000000000 +0200
+++ new/yast2-dhcp-server-2.17.0/src/Makefile.in 2008-08-01
10:07:42.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/testsuite/Makefile.in
new/yast2-dhcp-server-2.17.0/testsuite/Makefile.in
--- old/yast2-dhcp-server-2.16.7/testsuite/Makefile.in 2008-05-19
19:58:49.000000000 +0200
+++ new/yast2-dhcp-server-2.17.0/testsuite/Makefile.in 2008-08-01
10:07:42.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-dhcp-server-2.16.7/VERSION
new/yast2-dhcp-server-2.17.0/VERSION
--- old/yast2-dhcp-server-2.16.7/VERSION 2008-03-19 17:40:39.000000000
+0100
+++ new/yast2-dhcp-server-2.17.0/VERSION 2008-08-01 10:25:37.000000000
+0200
@@ -1 +1 @@
-2.16.7
+2.17.0


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages