Added description to init.d script in order to make it compliant
with rc-system and avoid annoying warning messages on syslog.
---
 main/ipset/APKBUILD              | 5 +++++
 main/mini_httpd/APKBUILD         | 8 ++++----
 main/mini_httpd/mini_httpd.initd | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD
index 0706a0d..d088c08 100644
--- a/main/ipset/APKBUILD
+++ b/main/ipset/APKBUILD
@@ -1,8 +1,13 @@
 # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 pkgname=ipset
+<<<<<<< 3d3cd382227f735072e0721ce23155af42297b69
 pkgver=6.27
 pkgrel=0
+=======
+pkgver=6.25.1
+pkgrel=1
+>>>>>>> main/ipset: Increased pkgrel
 pkgdesc="Manage Linux IP sets"
 url=http://ipset.netfilter.org/
 arch="all"
diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index f75b253..8b889c2 100644
--- a/main/mini_httpd/APKBUILD
+++ b/main/mini_httpd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mini_httpd
 pkgver=1.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Small forking webserver with ssl and ipv6 support"
 url="http://www.acme.com/software/mini_httpd/"
 arch="all"
@@ -55,13 +55,13 @@ package() {
 
 md5sums="c7d18a2952eb44282366c127e6dc3870  mini_httpd-1.21.tar.gz
 9254094233d05a69b2953dd9e8c9ce1c  mini_httpd.conf.sample
-daf6c5a53a6e7ef77e9dcf3c8c4d4b1f  mini_httpd.initd
+1679e25f17788a8c9be752ff059bbd9b  mini_httpd.initd
 915683e9c7e1cef7ce9b1bbaa31ab680  mini_httpd.logrotate"
 sha256sums="0829969f6e8cd7263dfc0eeeaddc92b9a564c7a68bc72b2d1b4af6c2198d9931  mini_httpd-1.21.tar.gz
 bc6fb1d7a1ac42549b469be5dd4368a5afca502562f9488a7061f16d0434d353  mini_httpd.conf.sample
-23f3dd256f0b3e8ef0d7ba184954d9ce2f7825b90583a03d8fb4e4409d20a89f  mini_httpd.initd
+cae12348aa748a24d52ca51c7846e5af28e3bf3c57c08b5f436b1fb82f4aa0cd  mini_httpd.initd
 e7b4388fc574916b0b4948c60655f55c51a481fe1b2c2f34c55775f0c454bcb5  mini_httpd.logrotate"
 sha512sums="e5f0e0450d2f464bda1ff0e0dff90422c9f54d28a2cbab028a2d02db0636ad6936d2871f35ec089e57cf5aa2e1f0fed27e195be110367c8d8dffe3e3f4367201  mini_httpd-1.21.tar.gz
 4ecb6a2686cebfa97ff5f7ab99f6903d43468a01eea9d3e5852f2bcc48f280b538a17acaa30aff05ea4645df8bfa6544082a494452e1eff9745f86460e378411  mini_httpd.conf.sample
-f3ea1e2766bcd4dfd086ca666f70526d8e35f734aeabf5f96949e6d1b11aac5a0be5381e9e20541521743b89239d933fe8fb6a93bf9aa964ae71f8859a39e004  mini_httpd.initd
+821e775318d7fff1f77dc3bd08ac2095233a9224be424eb796c1d6eae6cea5b1ed99a6b18d367bb120ceff5f5a2026f88c6bc3d54a754120bc68b27ea7c46a49  mini_httpd.initd
 ebaae32d151de8d8f923b0bbfd7a3524d47ee96fce46b46e8f44f5495459828508bb98b3c0250c76bf76e205f61ef4dfc273835731e3edf8e3d51761dd638e3c  mini_httpd.logrotate"
diff --git a/main/mini_httpd/mini_httpd.initd b/main/mini_httpd/mini_httpd.initd
index ad0669b..91a67cc 100755
--- a/main/mini_httpd/mini_httpd.initd
+++ b/main/mini_httpd/mini_httpd.initd
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.init,v 1.2 2007/08/26 21:20:21 bangert Exp $
 
+description="Small HTTP server"
+
 pidfile=/var/run/mini_httpd/${SVCNAME}.pid
 
 depend() {
-- 
2.6.3



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

On Thu, 19 Nov 2015 19:09:09 +0100
Daniele Coli <danielsan.dani@gmail.com> wrote:

> Added description to init.d script in order to make it compliant
> with rc-system and avoid annoying warning messages on syslog.
> ---
>  main/ipset/APKBUILD              | 5 +++++
>  main/mini_httpd/APKBUILD         | 8 ++++----
>  main/mini_httpd/mini_httpd.initd | 2 ++
>  3 files changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD
> index 0706a0d..d088c08 100644
> --- a/main/ipset/APKBUILD
> +++ b/main/ipset/APKBUILD
> @@ -1,8 +1,13 @@
>  # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
>  # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
>  pkgname=ipset
> +<<<<<<< 3d3cd382227f735072e0721ce23155af42297b69
>  pkgver=6.27
>  pkgrel=0
> +=======
> +pkgver=6.25.1
> +pkgrel=1
> +>>>>>>> main/ipset: Increased pkgrel  


This looks like an unresolved conflict that got into the commit

I'll clean that up.

thanks!

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---