Patches for aports can be sent to this list

3

[alpine-aports] [PATCH 0/3] main/apache2: Problems caused by commit ccc056dbf9d3

Przemyslaw Pawelczyk
Details
Message ID
<1466417921-3466-1-git-send-email-przemoc@zoho.com>
Sender timestamp
1466417918
DKIM signature
missing
Download raw message
It's a first patch set (of more) intended to alleviate problems caused
by commit ccc056dbf9d3. See my wiki and bug page for some more details
(they will be further updated):
https://wiki.alpinelinux.org/wiki/User:Przemoc/Todo
http://bugs.alpinelinux.org/issues/5757

Patches with AL 3.4 in subject are not intended for master branch.

apache2 is kind of special as it already has .pre-upgrade script, so in
this case unification seemed fine.  In other cases, where .pre-upgrade
script doesn't exist, such symlink should be part of 3.4-stable only.


Przemyslaw Pawelczyk (3):
  main/apache2: Unify .pre-upgrade with .pre-install.
  main/apache2: AL 3.4 band-aid for ccc056dbf9d3 in .pre-* script.
  main/apache2: Bump pkgrel.

 main/apache2/APKBUILD            | 2 +-
 main/apache2/apache2.pre-install | 1 +
 main/apache2/apache2.pre-upgrade | 7 +------
 3 files changed, 3 insertions(+), 7 deletions(-)
 mode change 100644 => 120000 main/apache2/apache2.pre-upgrade

-- 
2.6.6




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

[alpine-aports] [PATCH 1/3] main/apache2: Unify .pre-upgrade with .pre-install.

Przemyslaw Pawelczyk
Details
Message ID
<1466417921-3466-2-git-send-email-przemoc@zoho.com>
In-Reply-To
<1466417921-3466-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1466417919
DKIM signature
missing
Download raw message
Patch: +1 -6
apache2.pre-upgrade now links to apache2.pre-install.

It's not something we want to do for all packages in master (edge).
apache2 already had .pre-upgrade script (ensuring www-data group
existence and making apache user a member of it), which is what existing
.pre-install script also does, so this kind of unification is fine here.

In most other cases linking .pre-upgrade to .pre-install should happen
only in 3.4-stable branch.
---
 main/apache2/apache2.pre-upgrade | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
 mode change 100644 => 120000 main/apache2/apache2.pre-upgrade

diff --git a/main/apache2/apache2.pre-upgrade b/main/apache2/apache2.pre-upgrade
deleted file mode 100644
index bb3dba99cbdb..000000000000
--- a/main/apache2/apache2.pre-upgrade
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S -g 82 www-data 2>/dev/null
-addgroup apache www-data 2>/dev/null
-
-exit 0
diff --git a/main/apache2/apache2.pre-upgrade b/main/apache2/apache2.pre-upgrade
new file mode 120000
index 000000000000..df3b23038035
--- /dev/null
+++ b/main/apache2/apache2.pre-upgrade
@@ -0,0 +1 @@
+apache2.pre-install
\ No newline at end of file
-- 
2.6.6




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

[alpine-aports] [PATCH 2/3] main/apache2: AL 3.4 band-aid for ccc056dbf9d3 in .pre-* script.

Przemyslaw Pawelczyk
Details
Message ID
<1466417921-3466-3-git-send-email-przemoc@zoho.com>
In-Reply-To
<1466417921-3466-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1466417920
DKIM signature
missing
Download raw message
Patch: +1 -0
Make sure that user is part of the same named group.

Requires patch "main/apache2: Unify .pre-upgrade with .pre-install."
---
 main/apache2/apache2.pre-install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index d4ede7476687..9323e75fe5b0 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -3,6 +3,7 @@
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S apache 2>/dev/null
 adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -g apache apache 2>/dev/null
+addgroup apache apache 2>/dev/null # AL 3.4 band-aid for ccc056dbf9d3
 addgroup apache www-data 2>/dev/null
 
 exit 0
-- 
2.6.6




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

[alpine-aports] [PATCH 3/3] main/apache2: Bump pkgrel.

Przemyslaw Pawelczyk
Details
Message ID
<1466417921-3466-4-git-send-email-przemoc@zoho.com>
In-Reply-To
<1466417921-3466-1-git-send-email-przemoc@zoho.com> (view parent)
Sender timestamp
1466417921
DKIM signature
missing
Download raw message
Patch: +1 -1
---
 main/apache2/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 75f1b4d92725..da01165defc9 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=apache2
 _pkgreal=httpd
 pkgver=2.4.20
-pkgrel=1
+pkgrel=2
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 arch="all"
-- 
2.6.6




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