From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZN8h51sGSz32gJ for ; Wed, 26 Mar 2025 14:44:37 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZN8h51Zn5z30Zp for ; Wed, 26 Mar 2025 14:44:37 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZN8h44tQ9zys for ; Wed, 26 Mar 2025 14:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1743000276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=ut6V1aaJrdskZcAO6HOwEHswFROkS70ZRywpPRKwbZw=; b=VhFEFHYFyMWq9cGxHhekzeTdvMi9Kqxkh0atZMFN9o57kBRsu2ceTUa8b5+38al4OJv8oW rFbCY65PUM3pmjw7QIYr8KGXEHuG3vMrUimCoOIiZsvnIn0uURv2RUvfptOvjt+h2/EGpi k/xpBZ+937Kq47INCQC/woLU5ouHKxtDxdMZri6h/+yjU+CnOmRTkCyuN5nD4ZCtaWTpWQ UFIfyM+6E7gc9BsM57j/En1zRMTWG97GLMh0myeKy7GdpBrF8VCYD3ME1PfoFIs2SMLHl2 NenrrEL512FHpKvHDc/3uDSGFgR3mak8fcJTrjXQWzTuBGFOaeUT+7X6GLkVIg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1743000276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=ut6V1aaJrdskZcAO6HOwEHswFROkS70ZRywpPRKwbZw=; b=DJWB8hyfuBNOWUKopFtIIw0gBC8XfhJPLlCD/7UeOcoZJUOHUUWPzpiDWEBeZ4SK6HORkj VZ2bwCRWR30wu0Ag== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4ZN8h43cmsz2xZ6; Wed, 26 Mar 2025 14:44:36 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3f99c91f354a6a433472c714c9e1a854a4d4d8ab X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d028a679ab0a9a7fd29e2cf31a2fd3761f261fe1 X-Git-Newrev: 3f99c91f354a6a433472c714c9e1a854a4d4d8ab Message-Id: <4ZN8h43cmsz2xZ6@people01.haj.ipfire.org> Date: Wed, 26 Mar 2025 14:44:36 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 3f99c91f354a6a433472c714c9e1a854a4d4d8ab (commit) from d028a679ab0a9a7fd29e2cf31a2fd3761f261fe1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3f99c91f354a6a433472c714c9e1a854a4d4d8ab Author: Michael Tremer Date: Tue Mar 25 15:38:10 2025 +0000 Revert "vpnmain.cgi: Fixes bug13737 - increments the serial number to allow cert regen" This reverts commit 7d1d7e0bec4c7f991dbbb622ce414e0b91d14d74. Reverted as requested by Adolf due to some work being required on this. Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 7 ------- 1 file changed, 7 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 9107bf00a..e30506fdf 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1247,13 +1247,6 @@ END exit(0); ROOTCERT_SUCCESS: - -# Increment the serial number to 02 after root and host certificates are -# created so that cert regeneration works. - open(FILE, ">${General::swroot}/certs/serial"); - print FILE "02"; - close FILE; - if (&vpnenabled) { &General::system('/usr/local/bin/ipsecctrl', 'S'); sleep $sleepDelay; hooks/post-receive -- IPFire 2.x development tree