[arch-commits] Commit in kea/repos (2 files)

Baptiste Jonglez zorun at archlinux.org
Thu Aug 10 15:25:54 UTC 2017


    Date: Thursday, August 10, 2017 @ 15:25:54
  Author: zorun
Revision: 249733

kea: fix (again) missing files in repos/community-{i686,x86_64}

Added:
  kea/repos/community-i686/fix-scripts-include-path.patch
  kea/repos/community-x86_64/fix-scripts-include-path.patch

-------------------------------------------------+
 community-i686/fix-scripts-include-path.patch   |  162 ++++++++++++++++++++++
 community-x86_64/fix-scripts-include-path.patch |  162 ++++++++++++++++++++++
 2 files changed, 324 insertions(+)

Added: community-i686/fix-scripts-include-path.patch
===================================================================
--- community-i686/fix-scripts-include-path.patch	                        (rev 0)
+++ community-i686/fix-scripts-include-path.patch	2017-08-10 15:25:54 UTC (rev 249733)
@@ -0,0 +1,162 @@
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:05:19.092517025 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:05:27.885738379 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in	2017-08-01 13:11:20.277913463 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in	2017-08-01 13:11:31.137774925 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in	2017-08-01 13:11:37.317696084 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in	2017-08-01 13:11:43.007623495 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:03:52.826948671 +0200
++++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:04:53.279512387 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`pgsql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:03:52.826948671 +0200
++++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:11:52.627500763 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`pgsql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in	2017-08-01 13:03:52.826948671 +0200
++++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in	2017-08-01 13:11:59.840742064 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`pgsql_version "$@"`
+ 

Added: community-x86_64/fix-scripts-include-path.patch
===================================================================
--- community-x86_64/fix-scripts-include-path.patch	                        (rev 0)
+++ community-x86_64/fix-scripts-include-path.patch	2017-08-10 15:25:54 UTC (rev 249733)
@@ -0,0 +1,162 @@
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:05:19.092517025 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:05:27.885738379 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh.in	2017-08-01 13:11:20.277913463 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh.in	2017-08-01 13:11:31.137774925 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh.in	2017-08-01 13:11:37.317696084 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in kea-1.2.0/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in	2017-08-01 13:03:52.823615380 +0200
++++ kea-1.2.0/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in	2017-08-01 13:11:43.007623495 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`mysql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:03:52.826948671 +0200
++++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh.in	2017-08-01 13:04:53.279512387 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`pgsql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:03:52.826948671 +0200
++++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in	2017-08-01 13:11:52.627500763 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`pgsql_version "$@"`
+ 
+diff -ru kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in kea-1.2.0/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
+--- kea-1.2.0.old/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in	2017-08-01 13:03:52.826948671 +0200
++++ kea-1.2.0/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in	2017-08-01 13:11:59.840742064 +0200
+@@ -1,12 +1,7 @@
+ #!/bin/sh
+ 
+-# Include utilities. Use installed version if available and
+-# use build version if it isn't.
+-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
+-    . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
+-else
+-    . @abs_top_builddir@/src/bin/admin/admin-utils.sh
+-fi
++# Include utilities.
++. /usr/share/kea/scripts/admin-utils.sh
+ 
+ VERSION=`pgsql_version "$@"`
+ 



More information about the arch-commits mailing list