public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1
@ 2015-05-13 17:48 git
  0 siblings, 0 replies; only message in thread
From: git @ 2015-05-13 17:48 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 5028 bytes --]

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  45f95add11bf1e7335afea2585c2e6cf4b6cb0b1 (commit)
       via  7b9233935e451d4305e7454bfbcc964cfb53d2bb (commit)
      from  51ff5115a0d7e8b5ea99d8a0b1aaac1823487304 (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 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed May 13 19:46:18 2015 +0200

    elinks/cyrus-imapd: bump package version openssl 0.9.8 drop.
    
    some old installation has this addon still linked against openssl 0.9.8
    so we need to update it.

commit 7b9233935e451d4305e7454bfbcc964cfb53d2bb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed May 13 19:44:15 2015 +0200

    core90: fix missing filename in metafile.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/90/update.sh | 4 +---
 lfs/cyrus-imapd                    | 4 ++--
 lfs/elinks                         | 4 ++--
 src/initscripts/init.d/firstsetup  | 3 ---
 4 files changed, 5 insertions(+), 10 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 52a8a8c..460c017 100644
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -261,9 +261,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
 		echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
 		echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
 		echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-		echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-		echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-		echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
+		rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null
 	fi
 fi
 
diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 2a826cd..8e61354 100644
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info(a)ipfire.org>                          #
+# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrus-imapd
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 
diff --git a/lfs/elinks b/lfs/elinks
index 59f1426..2727423 100644
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elinks
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index dca3e40..70c30b4 100644
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -40,9 +40,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
 		echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
 		echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
 		echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-		echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-		echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-		echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
 	fi
 fi
 


hooks/post-receive
--
IPFire 2.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-05-13 17:48 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-13 17:48 [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 45f95add11bf1e7335afea2585c2e6cf4b6cb0b1 git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox