mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 12:26:52 +02:00
Merge branch 'master' of git://git.alpinelinux.org/aports
This commit is contained in:
Michael Mason
commit
9df1181ade
@ -1,7 +1,7 @@
|
||||
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=bind
|
||||
pkgver=9.6.1_p3
|
||||
pkgver=9.7.0_p1
|
||||
_ver=${pkgver%_p*}
|
||||
_p=${pkgver#*_p}
|
||||
pkgrel=0
|
||||
@ -9,7 +9,7 @@ pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools"
|
||||
url="http://www.isc.org"
|
||||
license="as-is"
|
||||
depends=
|
||||
makedepends="openssl-dev"
|
||||
makedepends="openssl-dev perl"
|
||||
install="$pkgname.pre-install $pkgname.post-install"
|
||||
subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-tools"
|
||||
source="http://ftp.isc.org/isc/bind9/${_ver}-P${_p}/bind-${_ver}-P${_p}.tar.gz
|
||||
@ -92,7 +92,7 @@ tools() {
|
||||
done
|
||||
}
|
||||
|
||||
md5sums="a0952d589b3051538033387be4c983f9 bind-9.6.1-P3.tar.gz
|
||||
md5sums="78e3e38c6252e41ded1afa1aeb183622 bind-9.7.0-P1.tar.gz
|
||||
f270a5b0a28ab6e818840c5c368ddbcc bind.so_bsdcompat.patch
|
||||
92914193cc603d8d81ef00534ce9c1c9 bind.initd
|
||||
8b05a287976d66d51c18b73ee7523671 bind.confd
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=cmake
|
||||
pkgver=2.8.0
|
||||
pkgver=2.8.1
|
||||
pkgrel=0
|
||||
pkgdesc="CMake is a cross-platform open-source make system"
|
||||
url="http://www.cmake.org"
|
||||
@ -42,4 +42,4 @@ package() {
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
md5sums="3b3679b8a6afaedc38a8c15dd7ff4fcf cmake-2.8.0.tar.gz"
|
||||
md5sums="a92ad653f9ccc1595d16cd9707f49acc cmake-2.8.1.tar.gz"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=dbus
|
||||
pkgver=1.2.20
|
||||
pkgver=1.2.24
|
||||
pkgrel=0
|
||||
pkgdesc="Freedesktop.org message bus system"
|
||||
url="http://www.freedesktop.org/Software/dbus"
|
||||
@ -37,5 +37,5 @@ package() {
|
||||
make DESTDIR="$pkgdir" install
|
||||
install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
|
||||
}
|
||||
md5sums="63f4e2412f6599a5e7b10281b9ddc0ac dbus-1.2.20.tar.gz
|
||||
md5sums="565346cecd9cfecf1463540c6086cc2c dbus-1.2.24.tar.gz
|
||||
58356b4db650a89312a670c02804c540 dbus.initd"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=e2fsprogs
|
||||
pkgver=1.41.10
|
||||
pkgver=1.41.11
|
||||
pkgrel=0
|
||||
pkgdesc="Standard Ext2/3/4 filesystem utilities"
|
||||
url="http://e2fsprogs.sourceforge.net"
|
||||
@ -9,15 +9,13 @@ depends=
|
||||
install="$pkgname.post-upgrade"
|
||||
makedepends="util-linux-ng-dev pkgconfig"
|
||||
subpackages="$pkgname-dev $pkgname-doc libcom_err"
|
||||
source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz
|
||||
0001-implement-com_right_r.patch"
|
||||
source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz"
|
||||
|
||||
depends_dev="util-linux-ng-dev"
|
||||
|
||||
_builddir="$srcdir"/$pkgname-$pkgver
|
||||
prepare() {
|
||||
cd "$_builddir"
|
||||
patch -p1 -i "$srcdir"/0001-implement-com_right_r.patch
|
||||
}
|
||||
|
||||
build () {
|
||||
@ -48,5 +46,4 @@ libcom_err() {
|
||||
mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
|
||||
}
|
||||
|
||||
md5sums="f9c7bb5c036a119453ce02fa871038da e2fsprogs-1.41.10.tar.gz
|
||||
600bedf9a85cd197c39715b0be5cc5f7 0001-implement-com_right_r.patch"
|
||||
md5sums="fb507a40c2706bc38306f150d069e345 e2fsprogs-1.41.11.tar.gz"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=git
|
||||
pkgver=1.7.0.2
|
||||
pkgver=1.7.0.3
|
||||
pkgrel=0
|
||||
pkgdesc="GIT - the stupid content tracker"
|
||||
url="http://git.or.cz/"
|
||||
@ -42,5 +42,5 @@ perl() {
|
||||
}
|
||||
|
||||
|
||||
md5sums="76518fa774b36de81d160b85fa4f19c1 git-1.7.0.2.tar.bz2
|
||||
md5sums="1a449b84dd60a066ea491a54346843e6 git-1.7.0.3.tar.bz2
|
||||
e63a201556c4f089de790805c09a2e5b bb-tar.patch"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# Contributor: Michael Mason <ms13sp@gmail.com>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=gnutls
|
||||
pkgver=2.8.5
|
||||
pkgrel=1
|
||||
pkgver=2.8.6
|
||||
pkgrel=0
|
||||
pkgdesc="A library which provides a secure connection"
|
||||
url="http://www.gnu.org/software/gnutls/"
|
||||
license="GPL"
|
||||
@ -30,4 +30,4 @@ package() {
|
||||
make -j1 DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
md5sums="e3b2788b79bfc82acbe717e3c54d4e92 gnutls-2.8.5.tar.bz2"
|
||||
md5sums="eb0a6d7d3cb9ac684d971c14f9f6d3ba gnutls-2.8.6.tar.bz2"
|
||||
|
||||
@ -4,7 +4,7 @@ _flavor=grsec
|
||||
pkgname=linux-${_flavor}
|
||||
pkgver=2.6.32.10
|
||||
_kernver=2.6.32
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="Linux kernel with grsecurity"
|
||||
url=http://grsecurity.net
|
||||
depends="mkinitfs linux-firmware"
|
||||
@ -19,6 +19,8 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
|
||||
ip_gre2.patch
|
||||
arp.patch
|
||||
xfrm-cache-size-revert.patch
|
||||
net-git-78f1cd-r8169-fix-broken-register-writes.patch
|
||||
net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch
|
||||
kernelconfig.x86
|
||||
"
|
||||
subpackages="$pkgname-dev linux-firmware:firmware"
|
||||
@ -129,4 +131,6 @@ a1959ececf64be61488ed84d0252c053 grsecurity-2.1.14-2.6.32.10-201003211638.patch
|
||||
13ca9e91700e459da269c957062bbea7 ip_gre2.patch
|
||||
4c39a161d918e7f274292ecfd168b891 arp.patch
|
||||
329fcab881425e001d3243caa4648478 xfrm-cache-size-revert.patch
|
||||
21ed38773d846097b7315e1e0801d87a net-git-78f1cd-r8169-fix-broken-register-writes.patch
|
||||
962a6dd7c639612fc8bdaeb836388b0b net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch
|
||||
7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86"
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
From 78f1cd02457252e1ffbc6caa44a17424a45286b8 Mon Sep 17 00:00:00 2001
|
||||
From: Francois Romieu <romieu@fr.zoreil.com>
|
||||
Date: Sat, 27 Mar 2010 19:35:46 -0700
|
||||
Subject: [PATCH] r8169: fix broken register writes
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This is quite similar to b39fe41f481d20c201012e4483e76c203802dda7
|
||||
though said registers are not even documented as 64-bit registers
|
||||
- as opposed to the initial TxDescStartAddress ones - but as single
|
||||
bytes which must be combined into 32 bits at the MMIO read/write
|
||||
level before being merged into a 64 bit logical entity.
|
||||
|
||||
Credits go to Ben Hutchings <ben@decadent.org.uk> for the MAR
|
||||
registers (aka "multicast is broken for ages on ARM) and to
|
||||
Timo Teräs <timo.teras@iki.fi> for the MAC registers.
|
||||
|
||||
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/r8169.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
||||
index b93fd23..7193afc 100644
|
||||
--- a/drivers/net/r8169.c
|
||||
+++ b/drivers/net/r8169.c
|
||||
@@ -2820,8 +2820,8 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
|
||||
spin_lock_irq(&tp->lock);
|
||||
|
||||
RTL_W8(Cfg9346, Cfg9346_Unlock);
|
||||
- RTL_W32(MAC0, low);
|
||||
RTL_W32(MAC4, high);
|
||||
+ RTL_W32(MAC0, low);
|
||||
RTL_W8(Cfg9346, Cfg9346_Lock);
|
||||
|
||||
spin_unlock_irq(&tp->lock);
|
||||
@@ -4747,8 +4747,8 @@ static void rtl_set_rx_mode(struct net_device *dev)
|
||||
mc_filter[1] = swab32(data);
|
||||
}
|
||||
|
||||
- RTL_W32(MAR0 + 0, mc_filter[0]);
|
||||
RTL_W32(MAR0 + 4, mc_filter[1]);
|
||||
+ RTL_W32(MAR0 + 0, mc_filter[0]);
|
||||
|
||||
RTL_W32(RxConfig, tmp);
|
||||
|
||||
--
|
||||
1.7.0.3
|
||||
|
||||
@ -0,0 +1,119 @@
|
||||
From c0cd884af045338476b8e69a61fceb3f34ff22f1 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Horman <nhorman@redhat.com>
|
||||
Date: Mon, 29 Mar 2010 13:16:02 -0700
|
||||
Subject: [PATCH] r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
|
||||
|
||||
Official patch to fix the r8169 frame length check error.
|
||||
|
||||
Based on this initial thread:
|
||||
http://marc.info/?l=linux-netdev&m=126202972828626&w=1
|
||||
This is the official patch to fix the frame length problems in the r8169
|
||||
driver. As noted in the previous thread, while this patch incurs a performance
|
||||
hit on the driver, its possible to improve performance dynamically by updating
|
||||
the mtu and rx_copybreak values at runtime to return performance to what it was
|
||||
for those NICS which are unaffected by the ideosyncracy (if there are any).
|
||||
|
||||
Summary:
|
||||
|
||||
A while back Eric submitted a patch for r8169 in which the proper
|
||||
allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too
|
||||
much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A
|
||||
long time prior to that however, Francois posted
|
||||
126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize
|
||||
setting due to the fact that the hardware behaved in odd ways when overlong
|
||||
frames were received on NIC's supported by this driver. This was mentioned in a
|
||||
security conference recently:
|
||||
http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html
|
||||
|
||||
It seems that if we can't enable frame size filtering, then, as Eric correctly
|
||||
noticed, we can find ourselves DMA-ing too much data to a buffer, causing
|
||||
corruption. As a result is seems that we are forced to allocate a frame which
|
||||
is ready to handle a maximally sized receive.
|
||||
|
||||
This obviously has performance issues with it, so to mitigate that issue, this
|
||||
patch does two things:
|
||||
|
||||
1) Raises the copybreak value to the frame allocation size, which should force
|
||||
appropriately sized packets to get allocated on rx, rather than a full new 16k
|
||||
buffer.
|
||||
|
||||
2) This patch only disables frame filtering initially (i.e., during the NIC
|
||||
open), changing the MTU results in ring buffer allocation of a size in relation
|
||||
to the new mtu (along with a warning indicating that this is dangerous).
|
||||
|
||||
Because of item (2), individuals who can't cope with the performance hit (or can
|
||||
otherwise filter frames to prevent the bug), or who have hardware they are sure
|
||||
is unaffected by this issue, can manually lower the copybreak and reset the mtu
|
||||
such that performance is restored easily.
|
||||
|
||||
Signed-off-by: Neil Horman <nhorman@redhat.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/r8169.c | 29 ++++++++++++++++++++++++-----
|
||||
1 files changed, 24 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
||||
index 7193afc..9674005 100644
|
||||
--- a/drivers/net/r8169.c
|
||||
+++ b/drivers/net/r8169.c
|
||||
@@ -186,7 +186,12 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
|
||||
|
||||
MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
|
||||
|
||||
-static int rx_copybreak = 200;
|
||||
+/*
|
||||
+ * we set our copybreak very high so that we don't have
|
||||
+ * to allocate 16k frames all the time (see note in
|
||||
+ * rtl8169_open()
|
||||
+ */
|
||||
+static int rx_copybreak = 16383;
|
||||
static int use_dac;
|
||||
static struct {
|
||||
u32 msg_enable;
|
||||
@@ -3217,9 +3222,13 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
|
||||
}
|
||||
|
||||
static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
|
||||
- struct net_device *dev)
|
||||
+ unsigned int mtu)
|
||||
{
|
||||
- unsigned int max_frame = dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
|
||||
+ unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
|
||||
+
|
||||
+ if (max_frame != 16383)
|
||||
+ printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
|
||||
+ "May lead to frame reception errors!\n");
|
||||
|
||||
tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
|
||||
}
|
||||
@@ -3231,7 +3240,17 @@ static int rtl8169_open(struct net_device *dev)
|
||||
int retval = -ENOMEM;
|
||||
|
||||
|
||||
- rtl8169_set_rxbufsize(tp, dev);
|
||||
+ /*
|
||||
+ * Note that we use a magic value here, its wierd I know
|
||||
+ * its done because, some subset of rtl8169 hardware suffers from
|
||||
+ * a problem in which frames received that are longer than
|
||||
+ * the size set in RxMaxSize register return garbage sizes
|
||||
+ * when received. To avoid this we need to turn off filtering,
|
||||
+ * which is done by setting a value of 16383 in the RxMaxSize register
|
||||
+ * and allocating 16k frames to handle the largest possible rx value
|
||||
+ * thats what the magic math below does.
|
||||
+ */
|
||||
+ rtl8169_set_rxbufsize(tp, 16383 - VLAN_ETH_HLEN - ETH_FCS_LEN);
|
||||
|
||||
/*
|
||||
* Rx and Tx desscriptors needs 256 bytes alignment.
|
||||
@@ -3884,7 +3903,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
|
||||
|
||||
rtl8169_down(dev);
|
||||
|
||||
- rtl8169_set_rxbufsize(tp, dev);
|
||||
+ rtl8169_set_rxbufsize(tp, dev->mtu);
|
||||
|
||||
ret = rtl8169_init_ring(dev);
|
||||
if (ret < 0)
|
||||
--
|
||||
1.7.0.3
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# Contributor: Carlo Landmeter <clandmeter at gmail>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=mdadm
|
||||
pkgver=3.1.1
|
||||
pkgrel=2
|
||||
pkgver=3.1.2
|
||||
pkgrel=0
|
||||
pkgdesc="a tool for managing Linux Software RAID arrays"
|
||||
url="http://neil.brown.name/blog/mdadm"
|
||||
license="GPL-2"
|
||||
@ -16,9 +16,13 @@ source="http://www.kernel.org/pub/linux/utils/raid/${pkgname}/${pkgname}-${pkgve
|
||||
mdadm-uclibc.patch
|
||||
"
|
||||
|
||||
build() {
|
||||
prepare() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
patch -p1 -i ../mdadm-uclibc.patch || return 1
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
make
|
||||
}
|
||||
|
||||
@ -32,8 +36,8 @@ package() {
|
||||
install -m644 -D mdadm.conf-example "$pkgdir"/etc/mdadm.conf
|
||||
}
|
||||
|
||||
md5sums="8bfeea282d21b5ef8e825122fb359457 mdadm-3.1.1.tar.gz
|
||||
md5sums="15c0112467df486b5805b18c7e51401f mdadm-3.1.2.tar.gz
|
||||
ce57e798431f7ab89f9b07a7daaa4852 mdadm.initd
|
||||
16d2b8eb2e17184357db503470fdd8eb mdadm.confd
|
||||
af5bb6e1479bf1d27cf50521af82dae1 mdadm-raid.initd
|
||||
aa601f072096fb8bae8b8946f59a561f mdadm-uclibc.patch"
|
||||
bca76ff25366bd1b70654b0cf4814236 mdadm-uclibc.patch"
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
--- a/platform-intel.c Mon Nov 9 15:58:52 2009
|
||||
+++ b/platform-intel.c Mon Nov 9 16:01:47 2009
|
||||
@@ -87,7 +87,9 @@
|
||||
diff --git a/platform-intel.c b/platform-intel.c
|
||||
index 30f7914..1e62e87 100644
|
||||
--- a/platform-intel.c
|
||||
+++ b/platform-intel.c
|
||||
@@ -91,7 +91,9 @@ struct sys_dev *find_driver_devices(const char *bus, const char *driver)
|
||||
/* generate canonical path name for the device */
|
||||
sprintf(path, "/sys/bus/%s/drivers/%s/%s",
|
||||
bus, driver, de->d_name);
|
||||
@ -11,13 +13,12 @@
|
||||
list->next = NULL;
|
||||
}
|
||||
closedir(driver_dir);
|
||||
@@ -203,9 +205,10 @@
|
||||
@@ -207,9 +209,9 @@ const struct imsm_orom *find_imsm_orom(void)
|
||||
char *devt_to_devpath(dev_t dev)
|
||||
{
|
||||
char device[40];
|
||||
char device[46];
|
||||
-
|
||||
+ char *tmp = malloc(PATH_MAX);
|
||||
+
|
||||
sprintf(device, "/sys/dev/block/%d:%d/device", major(dev), minor(dev));
|
||||
- return canonicalize_file_name(device);
|
||||
+ return tmp ? realpath(device, tmp) : NULL;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Contributor: Sebastian Wicki <gandro@gmx.net>
|
||||
# Maintainer: Natanael Copa <natanael.copa@gmail.com>
|
||||
pkgname=mpd
|
||||
pkgver=0.15.8
|
||||
pkgver=0.15.9
|
||||
pkgrel=0
|
||||
pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
|
||||
url="http://musicpd.org"
|
||||
@ -47,6 +47,6 @@ package() {
|
||||
"$pkgdir"/var/lib/mpd/playlists \
|
||||
"$pkgdir"/var/lib/mpd/music
|
||||
}
|
||||
md5sums="824e1ce46c0f468865d9e5e403cdaf5d mpd-0.15.8.tar.bz2
|
||||
md5sums="88f7bc0b17eac81d03b24929d12b8aa1 mpd-0.15.9.tar.bz2
|
||||
31d1515232d688d610d1664a0fb2a6a0 mpd.initd
|
||||
dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=mtools
|
||||
pkgver=4.0.12
|
||||
pkgver=4.0.13
|
||||
pkgrel=0
|
||||
pkgdesc="A collection of utilities to access MS-DOS disks from Unix without mounting them"
|
||||
url="http://www.gnu.org/software/mtools/"
|
||||
@ -25,4 +25,4 @@ package() {
|
||||
make -j1 install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
||||
md5sums="0ee77a14e5f113ad8136a867f8ed4c3a mtools-4.0.12.tar.bz2"
|
||||
md5sums="334fe1580d6e3f4b5c904ce097267477 mtools-4.0.13.tar.bz2"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=mysql
|
||||
pkgver=5.1.44
|
||||
pkgver=5.1.45
|
||||
pkgrel=0
|
||||
pkgdesc="A fast SQL database server"
|
||||
url="http://www.mysql.com/"
|
||||
@ -77,6 +77,6 @@ client() {
|
||||
done
|
||||
}
|
||||
|
||||
md5sums="a16fa6d6c7f40a963919cbc1c5e86111 mysql-5.1.44.tar.gz
|
||||
md5sums="06b5deb3a13c7600c38ba65b9f7e42c4 mysql-5.1.45.tar.gz
|
||||
25d08b02bff6aa379dc45859b7a3f28a mysql.initd
|
||||
15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=openssl
|
||||
pkgver=0.9.8m
|
||||
pkgver=0.9.8n
|
||||
pkgrel=0
|
||||
pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
|
||||
url=http://openssl.org
|
||||
@ -48,7 +48,7 @@ libcrypto() {
|
||||
mv "$pkgdir"/usr/lib/engines "$subpkgdir"/usr/lib/
|
||||
}
|
||||
|
||||
md5sums="898bf125370926d5f692a2201124f8ec openssl-0.9.8m.tar.gz
|
||||
md5sums="076d8efc3ed93646bd01f04e23c07066 openssl-0.9.8n.tar.gz
|
||||
04a6a88c2ee4badd4f8649792b73eaf3 openssl-0.9.8g-fix_manpages-1.patch
|
||||
c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch
|
||||
86b7f1bf50e1f3ba407ec62001a51a0d openssl-0.9.8k-padlock-sha.patch"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=pcre
|
||||
pkgver=8.01
|
||||
pkgver=8.02
|
||||
pkgrel=0
|
||||
pkgdesc="Perl-compatible regular expression library"
|
||||
url="http://pcre.sourceforge.net"
|
||||
@ -27,4 +27,4 @@ package() {
|
||||
make DESTDIR="$pkgdir" install || return 1
|
||||
}
|
||||
|
||||
md5sums="413be1c23dabe91f637fb3770f640006 pcre-8.01.tar.bz2"
|
||||
md5sums="27948c1b5f5c1eabc23cba1ebe4c316f pcre-8.02.tar.bz2"
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=postgresql
|
||||
pkgver=8.4.2
|
||||
pkgver=8.4.3
|
||||
pkgrel=0
|
||||
pkgdesc="A sophisticated object-relational DBMS"
|
||||
url="http://www.postgresql.org/"
|
||||
license="BSD"
|
||||
depends="bbsuid"
|
||||
depends="bbsuid postgresql-client"
|
||||
install="$pkgname.pre-upgrade"
|
||||
makedepends="readline-dev openssl-dev zlib-dev"
|
||||
subpackages="$pkgname-dev $pkgname-doc libpq $pkgname-client"
|
||||
source="ftp://ftp.$pkgname.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
|
||||
$pkgname.initd
|
||||
$pkgname.confd
|
||||
pg-restore.initd
|
||||
pg-restore.confd
|
||||
"
|
||||
|
||||
build() {
|
||||
@ -30,9 +32,13 @@ package() {
|
||||
make DESTDIR="$pkgdir" install || return 1
|
||||
|
||||
install -D -m755 "$srcdir"/postgresql.initd \
|
||||
"$pkgdir"/etc/init.d/postgresql
|
||||
"$pkgdir"/etc/init.d/postgresql || return 1
|
||||
install -D -m644 "$srcdir"/postgresql.confd \
|
||||
"$pkgdir"/etc/conf.d/postgresql || return 1
|
||||
"$pkgdir"/etc/conf.d/postgresql || return 1
|
||||
install -D -m755 "$srcdir"/pg-restore.initd \
|
||||
"$pkgdir"/etc/init.d/pg-restore || return 1
|
||||
install -D -m644 "$srcdir"/pg-restore.confd \
|
||||
"$pkgdir"/etc/conf.d/pg-restore || return 1
|
||||
}
|
||||
|
||||
libpq() {
|
||||
@ -50,6 +56,8 @@ client() {
|
||||
}
|
||||
|
||||
|
||||
md5sums="d738227e2f1f742d2f2d4ab56496c5c6 postgresql-8.4.2.tar.bz2
|
||||
e1ac78f216a8969a46e4486270b85a9b postgresql.initd
|
||||
6218755fde294b7d17b77d280a9c9106 postgresql.confd"
|
||||
md5sums="7f70e7b140fb190f268837255582b07e postgresql-8.4.3.tar.bz2
|
||||
740bc8414ee27b4c81dee1690c32679f postgresql.initd
|
||||
d6b58fc2411fdadcb9b762464c5bee7d postgresql.confd
|
||||
e64d0ab26b077ed80d883c0c40704ff4 pg-restore.initd
|
||||
8d1b69ac56a1a0d1cfd7da337bf6c5e2 pg-restore.confd"
|
||||
|
||||
16
main/postgresql/pg-restore.confd
Normal file
16
main/postgresql/pg-restore.confd
Normal file
@ -0,0 +1,16 @@
|
||||
|
||||
# Enable this to dump databases on shutdown and restore on boot
|
||||
#
|
||||
#PGDUMP="/var/lib/postgresql/backup/databases.pgdump"
|
||||
|
||||
# The dump file will be deleted once restored unless KEEP_DUMP is set.
|
||||
# This is to avoid accidental restoring of running database. If you know what
|
||||
# you are doing and want keep the dump, then enable the KEEP_DUMP option
|
||||
# below.
|
||||
#
|
||||
#KEEP_DUMP=yes
|
||||
|
||||
# If you enable the KEEP_DUMP bove you probably also want the --clean option
|
||||
# the the pg_dumpall command.
|
||||
#PG_DUMPALL_OPTS="--clean"
|
||||
|
||||
31
main/postgresql/pg-restore.initd
Normal file
31
main/postgresql/pg-restore.initd
Normal file
@ -0,0 +1,31 @@
|
||||
#!/sbin/runscript
|
||||
|
||||
opts="${opts} dump restore"
|
||||
|
||||
depend() {
|
||||
need postgresql
|
||||
}
|
||||
|
||||
restore() {
|
||||
[ -z "$PGDUMP" ] && return 0
|
||||
ebegin "Restoring PostgreSQL $PGDUMP"
|
||||
psql -U ${PG_USER:-postgres} ${PSQL_OPTS} -f "$PGDUMP"
|
||||
eend $?
|
||||
if [ -z "$KEEP_DUMP" ]; then
|
||||
rm -f "$PGDUMP"
|
||||
fi
|
||||
}
|
||||
|
||||
dump() {
|
||||
[ -z "$PGDUMP" ] && return 0
|
||||
pg_dumpall -U ${PG_USER:-postgres} ${PG_DUMPALL_OPTS} -f "$PGDUMP"
|
||||
}
|
||||
|
||||
start() {
|
||||
restore
|
||||
}
|
||||
|
||||
stop() {
|
||||
dump
|
||||
}
|
||||
|
||||
@ -50,3 +50,7 @@ WAIT_FOR_START="-w"
|
||||
#
|
||||
# Example:
|
||||
# export R_HOME="/usr/lib/R"
|
||||
|
||||
# Automatically set up a new database if missing on startup
|
||||
#AUTO_SETUP=yes
|
||||
|
||||
|
||||
@ -11,12 +11,15 @@ depend() {
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -d "$PGDATA" ] ; then
|
||||
[ -d "$PGDATA" ] && return 0
|
||||
|
||||
if [ -z "$AUTO_SETUP" ] || [ "$AUTO_SETUP" = "no" ]; then
|
||||
eerror "Directory not found: $PGDATA"
|
||||
eerror "Please make sure that PGDATA points to the right path."
|
||||
eerror "You can run '/etc/init.d/postgresql setup' to setup a new database cluster."
|
||||
return 1
|
||||
fi
|
||||
setup
|
||||
}
|
||||
|
||||
start() {
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=zlib
|
||||
pkgver=1.2.3.9
|
||||
pkgver=1.2.4
|
||||
pkgrel=0
|
||||
pkgdesc="A compression/decompression Library"
|
||||
license=custom:zlib
|
||||
url="http://www.gzip.org/zlib"
|
||||
url="http://zlib.net"
|
||||
depends=
|
||||
source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
|
||||
source="http://zlib.net/$pkgname-$pkgver.tar.gz"
|
||||
subpackages="$pkgname-dev $pkgname-doc"
|
||||
|
||||
_builddir="$srcdir/$pkgname-$pkgver"
|
||||
build() {
|
||||
cd "$_builddir"
|
||||
# we trade size for a little more speed.
|
||||
export CFLAGS="$CFLAGS -O2"
|
||||
./configure --prefix=/usr --libdir=/lib --shared
|
||||
make || return 1
|
||||
}
|
||||
@ -29,4 +31,4 @@ dev() {
|
||||
mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a
|
||||
}
|
||||
|
||||
md5sums="e63390cc6cbd0722f70729307d4dd01d zlib-1.2.3.9.tar.gz"
|
||||
md5sums="47f6ed51b3c83a8534f9228531effa18 zlib-1.2.4.tar.gz"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user