aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rwxr-xr-xcore/kiss-utils/build5
-rw-r--r--core/kiss-utils/checksums2
-rw-r--r--core/kiss-utils/sources2
-rw-r--r--core/kiss-utils/version1
-rwxr-xr-xcore/kiss/build10
-rw-r--r--core/kiss/checksums3
-rwxr-xr-xcore/kiss/files/kiss-chbuild (renamed from core/kiss-utils/files/kiss-chbuild)0
-rwxr-xr-xcore/kiss/post-install11
-rw-r--r--core/kiss/sources3
-rw-r--r--core/kiss/version2
10 files changed, 23 insertions, 16 deletions
diff --git a/core/kiss-utils/build b/core/kiss-utils/build
deleted file mode 100755
index 8f1e86b7..00000000
--- a/core/kiss-utils/build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-mv kiss-chbuild contrib
-
-install -t "$1/usr/bin" -D contrib/*
diff --git a/core/kiss-utils/checksums b/core/kiss-utils/checksums
deleted file mode 100644
index e1bb59ae..00000000
--- a/core/kiss-utils/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-c774ca22b56a89d7166fc85c11394946d453a5b730ab03300d4ea4fd8e08359a 1.7.7.tar.gz
-62912794b89fa305a1aca18e82b200300ae5b55ed67feb86466198abbb41789f kiss-chbuild
diff --git a/core/kiss-utils/sources b/core/kiss-utils/sources
deleted file mode 100644
index 2b1630b1..00000000
--- a/core/kiss-utils/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-https://github.com/kisslinux/kiss/archive/1.7.7.tar.gz
-files/kiss-chbuild
diff --git a/core/kiss-utils/version b/core/kiss-utils/version
deleted file mode 100644
index 65c67121..00000000
--- a/core/kiss-utils/version
+++ /dev/null
@@ -1 +0,0 @@
-1.7.7 1
diff --git a/core/kiss/build b/core/kiss/build
index 2e6c7c3f..6324e5e0 100755
--- a/core/kiss/build
+++ b/core/kiss/build
@@ -1,5 +1,9 @@
#!/bin/sh -e
-install -D kiss "$1/usr/bin/kiss"
-install -D kiss_path.sh "$1/etc/profile.d/kiss_path.sh"
-install -D kiss.1 "$1/usr/share/man/man1/kiss.1"
+mv kiss-chbuild contrib
+
+install -Dm755 kiss "$1/usr/bin/kiss"
+install -Dm755 kiss_path.sh "$1/etc/profile.d/kiss_path.sh"
+install -Dm644 kiss.1 "$1/usr/share/man/man1/kiss.1"
+
+install -Dm755 -t "$1/usr/bin" contrib/*
diff --git a/core/kiss/checksums b/core/kiss/checksums
index be48c8ba..8f51fb4c 100644
--- a/core/kiss/checksums
+++ b/core/kiss/checksums
@@ -1,2 +1,3 @@
-c774ca22b56a89d7166fc85c11394946d453a5b730ab03300d4ea4fd8e08359a 1.7.7.tar.gz
+c6d1e0df592a5407e3eaceb7c7094f75d0719ba61f5133cf8dd53a1edc9056d3 1.7.10.tar.gz
d56d159fd9f0c39a2692b4b00b1543b2eb476a0659aa6899efa0ff460863dc70 kiss_path.sh
+62912794b89fa305a1aca18e82b200300ae5b55ed67feb86466198abbb41789f kiss-chbuild
diff --git a/core/kiss-utils/files/kiss-chbuild b/core/kiss/files/kiss-chbuild
index 9df18ccb..9df18ccb 100755
--- a/core/kiss-utils/files/kiss-chbuild
+++ b/core/kiss/files/kiss-chbuild
diff --git a/core/kiss/post-install b/core/kiss/post-install
new file mode 100755
index 00000000..fa0f269b
--- /dev/null
+++ b/core/kiss/post-install
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+cat <<EOF
+NOTE:
+
+ kiss and kiss-utils packages have
+ been merged. You can remove kiss-utils if you have
+ it, and reinstall this package to use the upstream
+ contrib programs.
+
+EOF
diff --git a/core/kiss/sources b/core/kiss/sources
index 857f237d..da21c1a7 100644
--- a/core/kiss/sources
+++ b/core/kiss/sources
@@ -1,2 +1,3 @@
-https://github.com/kisslinux/kiss/archive/1.7.7.tar.gz
+https://github.com/kisslinux/kiss/archive/1.7.10.tar.gz
files/kiss_path.sh
+files/kiss-chbuild
diff --git a/core/kiss/version b/core/kiss/version
index 65c67121..a275899b 100644
--- a/core/kiss/version
+++ b/core/kiss/version
@@ -1 +1 @@
-1.7.7 1
+1.7.10 1