Hello community,
here is the log from the commit of package mipv6d for openSUSE:Factory checked in at 2011-11-07 14:21:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mipv6d (Old)
and /work/SRC/openSUSE:Factory/.mipv6d.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mipv6d", Maintainer is "mt@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mipv6d/mipv6d.changes 2011-09-23 02:13:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mipv6d.new/mipv6d.changes 2011-11-07 14:21:51.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 3 13:04:34 UTC 2011 - mt@suse.com
+
+- Updated to git master commit 74528e1f fixing a memory leak,
+ adopted build requires, touched ghost mip6d.conf, test the
+ config size in the init script.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mipv6d.spec ++++++
--- /var/tmp/diff_new_pack.VTNxgt/_old 2011-11-07 14:21:54.000000000 +0100
+++ /var/tmp/diff_new_pack.VTNxgt/_new 2011-11-07 14:21:54.000000000 +0100
@@ -19,7 +19,12 @@
Name: mipv6d
-BuildRequires: bison flex indent libnl-1_1-devel openssl-devel
+BuildRequires: bison flex indent openssl-devel
+%if 0%{?suse_version} > 1140
+BuildRequires: libnl-1_1-devel
+%else
+BuildRequires: libnl-devel
+%endif
Url: http://umip.org/
License: GPLv2 ; GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,7 +32,7 @@
Group: Productivity/Networking/Other
Summary: MIPL - Mobile IPv6 for Linux
Version: 2.0.2.umip.0.4
-Release: 2
+Release: 74528e1f.<RELEASE0>
Source0: mipv6-2.0.2-umip-0.4.tar.bz2
Source1: mipv6d.init
@@ -78,6 +83,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/init.d/mipv6d
ln -sf %{_sysconfdir}/init.d/mipv6d \
$RPM_BUILD_ROOT%{_sbindir}/rcmipv6d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/mip6d.conf
%post
%{?fillup_and_insserv:%fillup_and_insserv -f -n mipv6d}
++++++ mipv6-2.0.2-umip-0.4.tar.bz2 ++++++
++++ 4907 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/INSTALL new/mipv6-2.0.2-umip-0.4/INSTALL
--- old/mipv6-2.0.2-umip-0.4/INSTALL 2011-01-10 18:15:00.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/INSTALL 2011-11-03 13:25:24.000000000 +0100
@@ -1,64 +1,365 @@
-1. Make sure you are running a kernel configured and compiled with
- Mobile IPv6 support enabled. See INSTALL.kernel for more
- information.
+Installation Instructions
+*************************
-2. Run './configure' in the main directory. You may give any
- additional parameters (e.g. --prefix=/usr, defaults to /usr/local)
- to configure. See './configure --help' for complete listing.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- * Debug messages
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS
+ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
- By default, debug message printing is included in the compiled
- program. To disable debugging messages use --disable-debug with
- configure, otherwise debug messages will be compiled in.
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
- * Virtual debug terminal
-
- To enable virtual terminal for trouble shooting, use --enable-vt
- with configure. It allows access to some of mip6d state at
- runtime. Telnet to port 7777 on the localhost. You should get
- a prompt "mip6d> ". If needed, the port can be changed with
- daemon option --vt-service=PORT. Use 'help' to display
- available commands. Virtual terminal should be disabled, unless
- you are running a test environment.
-
- * Built-in crypto functions
-
- By default, OpenSSL is used to provide crypto functions. If the
- library is not found, MIPL will be compiled to use its own built
- in cryptographic functions. The default behavior may also be
- overidden using the --with-builtin-crypto option with configure.
-
- Kernel headers are assumed to be found in /usr/include/linux. If
- these are not the headers from your current kernel, please specify
- alternative include path, e.g.:
-
- CPPFLAGS='-isystem /usr/src/linux/include' ./configure
-
- Note that you may need to specify additional include path, for
- example on x86 architecture such as
- '-isystem /usr/src/linux/arch/x86/include'.
-
-3. Run 'make'. If everything went ok, you should now have mip6d
- compiled.
-
-4. Run 'make install'. Executables should now be installed and you
- are ready to configure the node for Mobile IPv6.
-
- Please refer to configuration file manual page mip6d.conf(5) for
- further information on how to configure your node. Also take a
- look at the example configuration files in the extras directory.
-
- For comments about NEMO check README.NEMO.
-
- For comments about IPsec support check README.IPsec.
-
-5. A startup script
-
- To automatically start the Mobile IPv6 subsystem, you need to have
- a startup script. Many distributions have their own style of
- startup scripts. We try to provide some scripts in the extras
- directory, but we cannot hope to support all possible variations.
- See if your favorite distribution is supported. If not, you can
- always write your own. We will be happy to accept contributed
- startup scripts to be included in subsequent releases.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/Makefile.am new/mipv6-2.0.2-umip-0.4/Makefile.am
--- old/mipv6-2.0.2-umip-0.4/Makefile.am 2011-01-10 19:02:06.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/Makefile.am 2011-11-03 13:20:24.000000000 +0100
@@ -7,7 +7,7 @@
extras/example-mn.conf licenses
MAINTAINERCLEANFILES = aclocal.m4 config.guess config.sub \
- configure config.h.in config.h.in~ \
+ configure config.h.in \
ylwrap Makefile.in $(DIST_ARCHIVES)
if MISSING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/man/mip6d.conf.man new/mipv6-2.0.2-umip-0.4/man/mip6d.conf.man
--- old/mipv6-2.0.2-umip-0.4/man/mip6d.conf.man 2011-01-10 19:02:40.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/man/mip6d.conf.man 2011-11-03 13:26:34.000000000 +0100
@@ -259,7 +259,7 @@
Default: 86400
.TP
-.BR "HaAcceptMobRtr enabled | disabled"
+.BR "HaAcceptMobRtr " "enabled | disabled" ";"
Indicates if the HA accepts Mobile Router bindings.
@@ -274,7 +274,7 @@
Mobile Network Prefixes, instead of one of the home link prefixes.
.TP
-.BR "BindingAclPolicy " "address MNP list " "allow | deny"
+.BR "BindingAclPolicy " "address " "MNP-list " "allow | deny" ";"
Defines if a MN is allowed to register with the HA or not. The home address
of the MN is given in the address field. The mobile network prefixes
@@ -284,7 +284,7 @@
.B "(3ffe:2620:6:3::/64, 3ffe:2620:6:4::/64)"
.TP
-.BR "DefaultBindingAclPolicy allow | deny"
+.BR "DefaultBindingAclPolicy " "allow | deny" ";"
Defines the default policy if no matching BindingAclPolicy entry is found for
a MN.
@@ -337,7 +337,7 @@
Default: enabled
.TP
-.BR "MnUseAllInterfaces enabled | disabled"
+.BR "MnUseAllInterfaces " "enabled | disabled" ";"
Indicates if all interfaces should be used for mobility. The preference
of these interfaces is always 1. Unless you use dynamically created and
@@ -348,7 +348,7 @@
Default: disabled
.TP
-.BR "MobRtrUseExplicitMode enabled | disabled"
+.BR "MobRtrUseExplicitMode " "enabled | disabled" ";"
Toggles between explicit or implicit mode home registrations in the MR.
@@ -388,7 +388,7 @@
Default: 0
.TP
-.BR "OptimisticHandoff enabled | disabled"
+.BR "OptimisticHandoff " "enabled | disabled" ";"
When a Mobile Node sends a Binding Update to the Home Agent, no Route
Optimized or reverse tunneled traffic is sent until a Binding
@@ -438,7 +438,7 @@
Default: ::
.TP
-.BR "IsMobRtr enabled | disabled"
+.BR "IsMobRtr " "enabled | disabled" ";"
Defines if the MN is a NEMO MR.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/man/mip6d.conf.tmpl new/mipv6-2.0.2-umip-0.4/man/mip6d.conf.tmpl
--- old/mipv6-2.0.2-umip-0.4/man/mip6d.conf.tmpl 2011-01-07 11:55:44.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/man/mip6d.conf.tmpl 2011-11-03 13:20:24.000000000 +0100
@@ -259,7 +259,7 @@
Default: 86400
.TP
-.BR "HaAcceptMobRtr enabled | disabled"
+.BR "HaAcceptMobRtr " "enabled | disabled" ";"
Indicates if the HA accepts Mobile Router bindings.
@@ -274,7 +274,7 @@
Mobile Network Prefixes, instead of one of the home link prefixes.
.TP
-.BR "BindingAclPolicy " "address MNP list " "allow | deny"
+.BR "BindingAclPolicy " "address " "MNP-list " "allow | deny" ";"
Defines if a MN is allowed to register with the HA or not. The home address
of the MN is given in the address field. The mobile network prefixes
@@ -284,7 +284,7 @@
.B "(3ffe:2620:6:3::/64, 3ffe:2620:6:4::/64)"
.TP
-.BR "DefaultBindingAclPolicy allow | deny"
+.BR "DefaultBindingAclPolicy " "allow | deny" ";"
Defines the default policy if no matching BindingAclPolicy entry is found for
a MN.
@@ -337,7 +337,7 @@
Default: enabled
.TP
-.BR "MnUseAllInterfaces enabled | disabled"
+.BR "MnUseAllInterfaces " "enabled | disabled" ";"
Indicates if all interfaces should be used for mobility. The preference
of these interfaces is always 1. Unless you use dynamically created and
@@ -348,7 +348,7 @@
Default: disabled
.TP
-.BR "MobRtrUseExplicitMode enabled | disabled"
+.BR "MobRtrUseExplicitMode " "enabled | disabled" ";"
Toggles between explicit or implicit mode home registrations in the MR.
@@ -388,7 +388,7 @@
Default: 0
.TP
-.BR "OptimisticHandoff enabled | disabled"
+.BR "OptimisticHandoff " "enabled | disabled" ";"
When a Mobile Node sends a Binding Update to the Home Agent, no Route
Optimized or reverse tunneled traffic is sent until a Binding
@@ -438,7 +438,7 @@
Default: ::
.TP
-.BR "IsMobRtr enabled | disabled"
+.BR "IsMobRtr " "enabled | disabled" ";"
Defines if the MN is a NEMO MR.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/missing new/mipv6-2.0.2-umip-0.4/missing
--- old/mipv6-2.0.2-umip-0.4/missing 2011-01-10 18:15:17.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/missing 2011-11-03 13:25:24.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -103,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
- lex|yacc)
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -145,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -154,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -164,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -192,8 +203,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -207,80 +218,78 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/src/bcache.c new/mipv6-2.0.2-umip-0.4/src/bcache.c
--- old/mipv6-2.0.2-umip-0.4/src/bcache.c 2011-01-07 11:55:44.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/src/bcache.c 2011-11-03 13:20:24.000000000 +0100
@@ -184,10 +184,9 @@
}
/**
- * bul_get - returns a binding update list entry
- * @hinfo: home address info, optional if our_addr is present
- * @our_addr: local address (home address)
- * @peer_addr: address of CN
+ * bcache_get - returns a binding cache entry
+ * @our_addr: our IPv6 address
+ * @peer_addr: peer's IPv6 address
*
* Returns reference to non-null entry on success and null on failure.
* If caller adjusts lifetime of entry, caller must call
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/src/gram.c new/mipv6-2.0.2-umip-0.4/src/gram.c
--- old/mipv6-2.0.2-umip-0.4/src/gram.c 2011-01-10 19:02:40.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/src/gram.c 2011-11-03 13:26:17.000000000 +0100
@@ -699,13 +699,13 @@
237, 241, 245, 249, 253, 257, 261, 270, 279, 288,
292, 296, 297, 301, 305, 306, 307, 311, 315, 320,
324, 328, 332, 333, 337, 341, 346, 350, 356, 357,
- 358, 361, 403, 404, 407, 408, 411, 415, 426, 432,
- 480, 481, 484, 488, 489, 493, 494, 499, 506, 512,
- 519, 542, 548, 549, 552, 555, 571, 572, 575, 643,
- 646, 647, 648, 649, 650, 651, 652, 653, 657, 661,
- 662, 663, 666, 667, 668, 671, 672, 673, 676, 677,
- 680, 695, 696, 699, 702, 706, 712, 721, 728, 731,
- 748, 758, 759, 762, 763, 766
+ 358, 361, 404, 405, 408, 409, 412, 416, 427, 433,
+ 481, 482, 485, 489, 490, 494, 495, 500, 507, 513,
+ 520, 543, 549, 550, 553, 556, 572, 573, 576, 644,
+ 647, 648, 649, 650, 651, 652, 653, 654, 658, 662,
+ 663, 664, 667, 668, 669, 672, 673, 674, 677, 678,
+ 681, 696, 697, 700, 703, 707, 713, 722, 729, 732,
+ 749, 759, 760, 763, 764, 767
};
#endif
@@ -2085,7 +2085,7 @@
uerror("Use of tunnel interface is not"
" possible for HA yet");
free((yyvsp[(1) - (2)].string));
- return -1;
+ return -1;
}
if (ni.ifindex <= 0) {
if (is_if_ha(&ni)) {
@@ -2097,8 +2097,9 @@
return -1;
}
/* ... but allow them for CN and MN */
- free((yyvsp[(1) - (2)].string));
}
+ free((yyvsp[(1) - (2)].string));
+
nni = malloc(sizeof(struct net_iface));
if (nni == NULL) {
uerror("out of memory");
@@ -2118,7 +2119,7 @@
case 46:
/* Line 1455 of yacc.c */
-#line 412 "gram.y"
+#line 413 "gram.y"
{
ni.mip6_if_entity = (yyvsp[(2) - (3)].num);
}
@@ -2127,7 +2128,7 @@
case 47:
/* Line 1455 of yacc.c */
-#line 416 "gram.y"
+#line 417 "gram.y"
{
int pref = (yyvsp[(2) - (3)].num);
if ((pref > POL_MN_IF_MIN_PREFERENCE) || (pref < 0)) {
@@ -2143,7 +2144,7 @@
case 48:
/* Line 1455 of yacc.c */
-#line 427 "gram.y"
+#line 428 "gram.y"
{
ni.is_tunnel = (yyvsp[(2) - (3)].bool);
}
@@ -2152,7 +2153,7 @@
case 49:
/* Line 1455 of yacc.c */
-#line 433 "gram.y"
+#line 434 "gram.y"
{
struct home_addr_info *nhai;
if (IN6_IS_ADDR_UNSPECIFIED(&hai.hoa.addr)) {
@@ -2203,7 +2204,7 @@
case 52:
/* Line 1455 of yacc.c */
-#line 485 "gram.y"
+#line 486 "gram.y"
{
memcpy(&hai.ha_addr, &(yyvsp[(2) - (3)].addr), sizeof(struct in6_addr));
}
@@ -2212,7 +2213,7 @@
case 54:
/* Line 1455 of yacc.c */
-#line 490 "gram.y"
+#line 491 "gram.y"
{
hai.altcoa = (yyvsp[(2) - (3)].bool);
}
@@ -2221,7 +2222,7 @@
case 56:
/* Line 1455 of yacc.c */
-#line 495 "gram.y"
+#line 496 "gram.y"
{
if ((yyvsp[(2) - (3)].bool))
hai.mob_rtr = IP6_MH_BU_MR;
@@ -2231,7 +2232,7 @@
case 57:
/* Line 1455 of yacc.c */
-#line 500 "gram.y"
+#line 501 "gram.y"
{
ipv6_addr_prefix(&hai.home_prefix, &(yyvsp[(2) - (5)].addr), (yyvsp[(4) - (5)].num));
hai.home_plen = (yyvsp[(4) - (5)].num);
@@ -2241,7 +2242,7 @@
case 58:
/* Line 1455 of yacc.c */
-#line 507 "gram.y"
+#line 508 "gram.y"
{
hai.mnp_count = mv_prefixes(&hai.mob_net_prefixes);
}
@@ -2250,7 +2251,7 @@
case 59:
/* Line 1455 of yacc.c */
-#line 513 "gram.y"
+#line 514 "gram.y"
{
hai.hoa.addr = (yyvsp[(1) - (3)].addr);
hai.plen = (yyvsp[(3) - (3)].num);
@@ -2260,7 +2261,7 @@
case 60:
/* Line 1455 of yacc.c */
-#line 520 "gram.y"
+#line 521 "gram.y"
{
if (!list_empty(&ipsec_ps.hoa_list)) {
struct list_head *lp, *tmp;
@@ -2286,7 +2287,7 @@
case 61:
/* Line 1455 of yacc.c */
-#line 543 "gram.y"
+#line 544 "gram.y"
{
ipsec_ps.ha = (yyvsp[(2) - (3)].addr);
}
@@ -2295,7 +2296,7 @@
case 65:
/* Line 1455 of yacc.c */
-#line 556 "gram.y"
+#line 557 "gram.y"
{
struct home_addr_info *hai;
@@ -2314,7 +2315,7 @@
case 68:
/* Line 1455 of yacc.c */
-#line 576 "gram.y"
+#line 577 "gram.y"
{
struct list_head *lp;
@@ -2385,70 +2386,70 @@
case 69:
/* Line 1455 of yacc.c */
-#line 643 "gram.y"
+#line 644 "gram.y"
{ (yyval.num) = (yyvsp[(2) - (2)].num); }
break;
case 70:
/* Line 1455 of yacc.c */
-#line 646 "gram.y"
+#line 647 "gram.y"
{ (yyval.num) = IPSEC_POLICY_TYPE_HOMEREGBINDING; }
break;
case 71:
/* Line 1455 of yacc.c */
-#line 647 "gram.y"
+#line 648 "gram.y"
{ (yyval.num) = IPSEC_POLICY_TYPE_MH; }
break;
case 72:
/* Line 1455 of yacc.c */
-#line 648 "gram.y"
+#line 649 "gram.y"
{ (yyval.num) = IPSEC_POLICY_TYPE_MOBPFXDISC; }
break;
case 73:
/* Line 1455 of yacc.c */
-#line 649 "gram.y"
+#line 650 "gram.y"
{ (yyval.num) = IPSEC_POLICY_TYPE_TUNNELHOMETESTING; }
break;
case 74:
/* Line 1455 of yacc.c */
-#line 650 "gram.y"
+#line 651 "gram.y"
{ (yyval.num) = IPSEC_POLICY_TYPE_TUNNELMH; }
break;
case 75:
/* Line 1455 of yacc.c */
-#line 651 "gram.y"
+#line 652 "gram.y"
{ (yyval.num) = IPSEC_POLICY_TYPE_TUNNELPAYLOAD; }
break;
case 76:
/* Line 1455 of yacc.c */
-#line 652 "gram.y"
+#line 653 "gram.y"
{ (yyval.num) = IPSEC_POLICY_TYPE_ICMP; }
break;
case 77:
/* Line 1455 of yacc.c */
-#line 653 "gram.y"
+#line 654 "gram.y"
{ (yyval.num) = IPSEC_POLICY_TYPE_ANY; }
break;
case 78:
/* Line 1455 of yacc.c */
-#line 657 "gram.y"
+#line 658 "gram.y"
{
uerror("IPsecPolicy must set at least one protocol");
return -1;
@@ -2458,84 +2459,84 @@
case 79:
/* Line 1455 of yacc.c */
-#line 661 "gram.y"
+#line 662 "gram.y"
{ (yyval.num) = (yyvsp[(1) - (1)].num); }
break;
case 80:
/* Line 1455 of yacc.c */
-#line 662 "gram.y"
+#line 663 "gram.y"
{ (yyval.num) = (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); }
break;
case 81:
/* Line 1455 of yacc.c */
-#line 663 "gram.y"
+#line 664 "gram.y"
{ (yyval.num) = (yyvsp[(1) - (3)].num) | (yyvsp[(2) - (3)].num) | (yyvsp[(3) - (3)].num); }
break;
case 82:
/* Line 1455 of yacc.c */
-#line 666 "gram.y"
+#line 667 "gram.y"
{ (yyval.num) = IPSEC_PROTO_ESP; }
break;
case 83:
/* Line 1455 of yacc.c */
-#line 667 "gram.y"
+#line 668 "gram.y"
{ (yyval.num) = IPSEC_PROTO_AH; }
break;
case 84:
/* Line 1455 of yacc.c */
-#line 668 "gram.y"
+#line 669 "gram.y"
{ (yyval.num) = IPSEC_PROTO_IPCOMP; }
break;
case 85:
/* Line 1455 of yacc.c */
-#line 671 "gram.y"
+#line 672 "gram.y"
{ (yyval.numpair)[0] = (yyval.numpair)[1] = 0; }
break;
case 86:
/* Line 1455 of yacc.c */
-#line 672 "gram.y"
+#line 673 "gram.y"
{ (yyval.numpair)[0] = (yyval.numpair)[1] = (yyvsp[(1) - (1)].num); }
break;
case 87:
/* Line 1455 of yacc.c */
-#line 673 "gram.y"
+#line 674 "gram.y"
{ (yyval.numpair)[0] = (yyvsp[(1) - (2)].num); (yyval.numpair)[1] = (yyvsp[(2) - (2)].num); }
break;
case 88:
/* Line 1455 of yacc.c */
-#line 676 "gram.y"
+#line 677 "gram.y"
{ (yyval.bool) = XFRM_POLICY_ALLOW; }
break;
case 89:
/* Line 1455 of yacc.c */
-#line 677 "gram.y"
+#line 678 "gram.y"
{ (yyval.bool) = (yyvsp[(1) - (1)].bool) ? XFRM_POLICY_ALLOW : XFRM_POLICY_BLOCK; }
break;
case 90:
/* Line 1455 of yacc.c */
-#line 681 "gram.y"
+#line 682 "gram.y"
{
struct xfrm_ro_pol *rp;
rp = malloc(sizeof(struct xfrm_ro_pol));
@@ -2553,28 +2554,28 @@
case 91:
/* Line 1455 of yacc.c */
-#line 695 "gram.y"
+#line 696 "gram.y"
{ (yyval.addr) = in6addr_any; }
break;
case 92:
/* Line 1455 of yacc.c */
-#line 696 "gram.y"
+#line 697 "gram.y"
{ (yyval.addr) = (yyvsp[(1) - (1)].addr); }
break;
case 93:
/* Line 1455 of yacc.c */
-#line 699 "gram.y"
+#line 700 "gram.y"
{ (yyval.bool) = (yyvsp[(1) - (1)].bool); }
break;
case 94:
/* Line 1455 of yacc.c */
-#line 703 "gram.y"
+#line 704 "gram.y"
{
conf.MoveModulePath = NULL;
}
@@ -2583,7 +2584,7 @@
case 95:
/* Line 1455 of yacc.c */
-#line 707 "gram.y"
+#line 708 "gram.y"
{
conf.MoveModulePath = NULL;
}
@@ -2592,7 +2593,7 @@
case 96:
/* Line 1455 of yacc.c */
-#line 713 "gram.y"
+#line 714 "gram.y"
{
if (pmgr_init((yyvsp[(1) - (1)].string), &conf.pmgr) < 0) {
uerror("error loading shared object %s", (yyvsp[(1) - (1)].string));
@@ -2604,7 +2605,7 @@
case 97:
/* Line 1455 of yacc.c */
-#line 722 "gram.y"
+#line 723 "gram.y"
{
if ((yyvsp[(1) - (1)].bool))
(yyval.num) = IP6_MH_BAS_ACCEPTED;
@@ -2616,14 +2617,14 @@
case 98:
/* Line 1455 of yacc.c */
-#line 728 "gram.y"
+#line 729 "gram.y"
{ (yyval.num) = (yyvsp[(1) - (1)].num); }
break;
case 99:
/* Line 1455 of yacc.c */
-#line 732 "gram.y"
+#line 733 "gram.y"
{
bae = malloc(sizeof(struct policy_bind_acl_entry));
if (bae == NULL) {
@@ -2643,7 +2644,7 @@
case 100:
/* Line 1455 of yacc.c */
-#line 749 "gram.y"
+#line 750 "gram.y"
{
if ((yyvsp[(1) - (1)].num) > 128) {
uerror("invalid prefix length %d", (yyvsp[(1) - (1)].num));
@@ -2656,7 +2657,7 @@
case 105:
/* Line 1455 of yacc.c */
-#line 767 "gram.y"
+#line 768 "gram.y"
{
struct prefix_list_entry *p;
p = malloc(sizeof(struct prefix_list_entry));
@@ -2675,7 +2676,7 @@
/* Line 1455 of yacc.c */
-#line 2679 "gram.c"
+#line 2680 "gram.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2887,6 +2888,6 @@
/* Line 1675 of yacc.c */
-#line 781 "gram.y"
+#line 782 "gram.y"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/src/gram.y new/mipv6-2.0.2-umip-0.4/src/gram.y
--- old/mipv6-2.0.2-umip-0.4/src/gram.y 2011-01-07 11:55:44.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/src/gram.y 2011-11-03 13:20:24.000000000 +0100
@@ -370,7 +370,7 @@
uerror("Use of tunnel interface is not"
" possible for HA yet");
free($1);
- return -1;
+ return -1;
}
if (ni.ifindex <= 0) {
if (is_if_ha(&ni)) {
@@ -382,8 +382,9 @@
return -1;
}
/* ... but allow them for CN and MN */
- free($1);
}
+ free($1);
+
nni = malloc(sizeof(struct net_iface));
if (nni == NULL) {
uerror("out of memory");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/src/hash.c new/mipv6-2.0.2-umip-0.4/src/hash.c
--- old/mipv6-2.0.2-umip-0.4/src/hash.c 2011-01-07 11:55:44.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/src/hash.c 2011-11-03 13:20:24.000000000 +0100
@@ -187,7 +187,7 @@
assert(peer_addr);
if ((new = (struct hash_entry *)malloc(sizeof(struct hash_entry))) == NULL) {
- dbg("out of memeory\n");
+ dbg("out of memory\n");
return -ENOMEM;
}
new->our_addr = our_addr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mipv6-2.0.2-umip-0.4/src/movement.c new/mipv6-2.0.2-umip-0.4/src/movement.c
--- old/mipv6-2.0.2-umip-0.4/src/movement.c 2011-01-07 12:51:07.000000000 +0100
+++ new/mipv6-2.0.2-umip-0.4/src/movement.c 2011-11-03 13:20:24.000000000 +0100
@@ -1508,7 +1508,7 @@
if ((iface = md_get_inet6_iface(&ifaces, rtr->ifindex)) == NULL)
MDBG2("Router we are inserting a route for is "
"reachable via an unknown interface (%d)\n",
- ifi->ifi_index);
+ rtr->ifindex);
else
iface_pref = iface->preference;
++++++ mipv6d.init ++++++
--- /var/tmp/diff_new_pack.VTNxgt/_old 2011-11-07 14:21:54.000000000 +0100
+++ /var/tmp/diff_new_pack.VTNxgt/_new 2011-11-07 14:21:54.000000000 +0100
@@ -86,7 +86,7 @@
fi
# Check for existence of needed config file
mip6d_CONF=/etc/mip6d.conf
-if test ! -r "$mip6d_CONF" ; then
+if test ! -s "$mip6d_CONF" ; then
case $1 in
stop|status)
# let kill/checkproc report
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org