Browse Source

vnuml: Updated (1.6.4-1 -> 1.8.9)

stable/0.2
Christian Wiese 14 years ago
parent
commit
aa10169ba6
  1. 33
      network/vnuml/configure-notcheck-devnettun.patch
  2. 23
      network/vnuml/vnuml-1.8.9-no-install-user.patch
  3. 31
      network/vnuml/vnuml-1.8.9-no-prefix-bin.patch
  4. 33
      network/vnuml/vnuml-1.8.9-no-tun-device-check.patch
  5. 4
      network/vnuml/vnuml.conf
  6. 5
      network/vnuml/vnuml.desc

33
network/vnuml/configure-notcheck-devnettun.patch

@ -1,33 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vnuml/configure-notcheck-devnettun.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- vnuml-1.6.2-1/configure.orig 2005-11-22 13:24:37.000000000 +0100
+++ vnuml-1.6.2-1/configure 2006-02-16 00:22:50.000000000 +0100
@@ -2896,14 +2896,6 @@
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
- :
-else
- { { echo "$as_me:$LINENO: error: tun device $VNUML_TUN not found. Please set the appropriate device using the --with-tun option." >&5
-echo "$as_me: error: tun device $VNUML_TUN not found. Please set the appropriate device using the --with-tun option." >&2;}
- { (exit 1); exit 1; }; }
-fi
-
# Check whether --with-tun_group or --without-tun_group was given.

23
network/vnuml/make-install.patch → network/vnuml/vnuml-1.8.9-no-install-user.patch

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vnuml/make-install.patch
# Copyright (C) 2006 The T2 SDE Project
# Filename: package/.../vnuml/vnuml-1.8.9-no-install-user.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,9 +14,13 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- vnuml-1.6.2-1/Makefile.in.orig 2006-02-16 14:19:32.000000000 +0100
+++ vnuml-1.6.2-1/Makefile.in 2006-02-16 14:50:31.000000000 +0100
@@ -187,7 +187,7 @@
Description: Do not install user/group and set permissions
Doing this within a build sandbox will fail in most case.
--- vnuml-1.8.9/Makefile.in.orig 2011-05-20 12:20:30.504002361 +0200
+++ vnuml-1.8.9/Makefile.in 2011-05-20 12:21:22.148002359 +0200
@@ -192,7 +192,7 @@
test -f Build || $(PERL) Build.PL; \
fi;
$(MAKE) all install-bin install-lib install-docs \
@ -25,12 +29,3 @@
# put share in place
.PHONY install-share:
@@ -249,7 +249,7 @@
install-bin:
cd bin; \
for file in $(INSTALLBIN_TARGETS); do \
- $(INSTALL) $$file ${prefix}/${BIN}; \
+ $(INSTALL) $$file ${BIN}/; \
done; \
# We test if it's a SuSE Linux Distribution to apply the patch
if test -f $(SUSE_FILE); then \

31
network/vnuml/vnuml-1.8.9-no-prefix-bin.patch

@ -0,0 +1,31 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vnuml/vnuml-1.8.9-no-prefix-bin.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: Do not add $prefix in front while installing binaries
The BIN variable seems to already include the prefix!
--- vnuml-1.8.9/Makefile.in.orig 2011-05-20 12:24:11.980002358 +0200
+++ vnuml-1.8.9/Makefile.in 2011-05-20 12:31:32.608002359 +0200
@@ -262,7 +262,7 @@
install-bin:
cd bin; \
for file in $(INSTALLBIN_TARGETS); do \
- $(INSTALL) $$file ${prefix}/${BIN}; \
+ $(INSTALL) $$file ${BIN}; \
done; \
# put lib binaries in place

33
network/vnuml/vnuml-1.8.9-no-tun-device-check.patch

@ -0,0 +1,33 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vnuml/vnuml-1.8.9-no-tun-device-check.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- vnuml-1.8.9/configure.ac.orig 2011-05-20 12:09:34.500002359 +0200
+++ vnuml-1.8.9/configure.ac 2011-05-20 12:10:32.512002358 +0200
@@ -247,14 +247,6 @@
AC_SUBST(PERL_MODULES_INSTALLROOT)
AC_CHECK_FILE([$PERL_MODULES_INSTALLROOT], AC_SUBST(PERL_MODULES_INSTALLROOT), AC_MSG_ERROR([Invalid Perl modules installroot directory: $VNUML_PERL_MODULES_INSTALLROOT. Please set the appropriate installroot directory using the --with-perl-modules-installroot.]))
-dnl tun device used for cloning
-AC_ARG_WITH(tun,
- AC_HELP_STRING([--with-tun=DEV],
- [tun device used for cloning (default: /dev/net/tun)]),
- VNUML_TUN=$withval,
- VNUML_TUN=/dev/net/tun)
-AC_CHECK_FILE([$VNUML_TUN], AC_SUBST(VNUML_TUN), AC_MSG_ERROR([tun device $VNUML_TUN not found. Please set the appropriate device using the --with-tun option.]))
-
AC_ARG_WITH(tun_group,
AC_HELP_STRING([--with-tun_group=GROUP],
[group to own tun device (default: uml-net)]),

4
network/vnuml/vnuml.conf

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vnuml/vnuml.conf
# Copyright (C) 2011 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -21,4 +22,7 @@ if [ $prefix_auto = 1 ] ; then
set_confopt
fi
# recreate configure script because we patch configure.ac
hook_add preconf 9 'autoreconf -v --install'
var_append makeinstopt " " "DATA=$root/$localstatedir/run"

5
network/vnuml/vnuml.desc

@ -2,6 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../vnuml/vnuml.desc
[COPY] Copyright (C) 2011 The OpenSDE Project
[COPY] Copyright (C) 2006 The T2 SDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@ -34,7 +35,7 @@
[L] OpenSource
[S] Stable
[V] 1.6.4-1
[V] 1.8.9
[P] X -----5---9 700.000
[D] 736467492 vnuml-1.6.4-1.tar.gz http://dl.sourceforge.net/sourceforge/vnuml/
[D] 2331454961 vnuml_1.8.9.orig.tar.gz http://dl.sourceforge.net/sourceforge/vnuml/

Loading…
Cancel
Save