From 39abdabd4f1d4296534cb27d2cf4aeda937122f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Mon, 13 Jan 2014 19:07:44 +0000 Subject: main/rxmtp: fix musl build --- main/rxmtp/APKBUILD | 29 +++++++++++++++++++++++------ main/rxmtp/fix-getline-clash.patch | 22 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 main/rxmtp/fix-getline-clash.patch diff --git a/main/rxmtp/APKBUILD b/main/rxmtp/APKBUILD index 4a666743b..787b2d406 100644 --- a/main/rxmtp/APKBUILD +++ b/main/rxmtp/APKBUILD @@ -2,25 +2,42 @@ # Maintainer: Timo Teras pkgname=rxmtp pkgver=1.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Rewrite and eXchange smtp proxy" url="http://dev.alpinelinux.org/alpine/rxmtp" -arch="x86" +arch="all" license="GPL" depends="" makedepends="" install= subpackages="" -source="http://dev.alpinelinux.org/alpine/$pkgname/$pkgname-$pkgver.tar.gz" +source="http://dev.alpinelinux.org/alpine/$pkgname/$pkgname-$pkgver.tar.gz + fix-getline-clash.patch" + +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make PREFIX=/usr || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make PREFIX=/usr DESTDIR="$pkgdir" install } -md5sums="4b4fe71ed690251de6ee6ad58223d7a7 rxmtp-1.1.3.tar.gz" +md5sums="4b4fe71ed690251de6ee6ad58223d7a7 rxmtp-1.1.3.tar.gz +d6b781fce6fa6b463f4cd6762adf3575 fix-getline-clash.patch" +sha256sums="28bf8547e5fbbae6cbad0ed403cfe80c2bb558a97e4eae64dd6307a27d48eea4 rxmtp-1.1.3.tar.gz +78d79c9526bdea950293cd75edd0acba0430d9b2e26fb57e8b85dcf4f0cae8e6 fix-getline-clash.patch" +sha512sums="6cc470095fb175b2f7bee9d86168e38ad072c8a27c29aa715a915bc3b4977d0deb02f10c930889a4ec0568537b6a1e5e349346872ef5b28708fcde4b662d72d7 rxmtp-1.1.3.tar.gz +0602d1d77f1b8cb9b70b5636a971fcc9e8db18be70b91937b031bdd32b7f2a54ad0eaac3ad55d95e76066b03719c5c34816f45a07ef88046e9455210c5ad03c3 fix-getline-clash.patch" diff --git a/main/rxmtp/fix-getline-clash.patch b/main/rxmtp/fix-getline-clash.patch new file mode 100644 index 000000000..ba20a6636 --- /dev/null +++ b/main/rxmtp/fix-getline-clash.patch @@ -0,0 +1,22 @@ +getline() is reserved symbol in libc. rename the app symbol. + +--- rxmtp-1.1.3.orig/smtp.c ++++ rxmtp-1.1.3/smtp.c +@@ -54,7 +54,7 @@ + return (0); + } + +-char *getline(char *line, int size, FILE *fp, int debug) ++char *mygetline(char *line, int size, FILE *fp, int debug) + { + *line = 0; + if (fgets(line, size, fp) == NULL) { +@@ -71,7 +71,7 @@ + + int getresp(char *line, int size, FILE *fp, int debug) + { +- if (getline(line, size, fp, debug) == NULL) ++ if (mygetline(line, size, fp, debug) == NULL) + return (-1); + + return (atoi(line)); -- cgit v1.2.3