X-Original-To: alpine-aports@lists.alpinelinux.org Received: from sender153-mail.zoho.com (sender153-mail.zoho.com [74.201.84.153]) by lists.alpinelinux.org (Postfix) with ESMTP id 0F4B85C44D3 for ; Mon, 20 Jun 2016 10:18:57 +0000 (GMT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:subject:date:message-id:in-reply-to:references; b=gsF39sBYkzpzSRFqJruZuZ7BIwgy/SZYTXr2o1LdVlpy/bXql0l2UvVu5X51tMMsDAOdjs+Fs0lQ UXhHoTHVEdrHz6wDp3ndlnri3DWZ5mu1+YcZsAhhLNiZ5KK9FwaI Received: from localhost (89-76-69-26.dynamic.chello.pl [89.76.69.26]) by mx.zohomail.com with SMTPS id 1466417935186442.42799184449893; Mon, 20 Jun 2016 03:18:55 -0700 (PDT) From: Przemyslaw Pawelczyk To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH 1/3] main/apache2: Unify .pre-upgrade with .pre-install. Date: Mon, 20 Jun 2016 12:18:39 +0200 Message-Id: <1466417921-3466-2-git-send-email-przemoc@zoho.com> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1466417921-3466-1-git-send-email-przemoc@zoho.com> References: <1466417921-3466-1-git-send-email-przemoc@zoho.com> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: 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 +++ /dev/null @@ -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 ---