[arch-commits] Commit in lib32-fakeroot/repos/multilib-x86_64 (5 files)
Felix Yan
felixonmars at archlinux.org
Sun Jan 17 18:40:11 UTC 2021
Date: Sunday, January 17, 2021 @ 18:40:10
Author: felixonmars
Revision: 821569
archrelease: copy trunk to multilib-x86_64
Added:
lib32-fakeroot/repos/multilib-x86_64/0001-Revert-Use-fixed-width-members-in-fake_msg.patch
(from rev 821568, lib32-fakeroot/trunk/0001-Revert-Use-fixed-width-members-in-fake_msg.patch)
lib32-fakeroot/repos/multilib-x86_64/PKGBUILD
(from rev 821568, lib32-fakeroot/trunk/PKGBUILD)
lib32-fakeroot/repos/multilib-x86_64/fakeroot.install
(from rev 821568, lib32-fakeroot/trunk/fakeroot.install)
Deleted:
lib32-fakeroot/repos/multilib-x86_64/PKGBUILD
lib32-fakeroot/repos/multilib-x86_64/fakeroot.install
-------------------------------------------------------+
0001-Revert-Use-fixed-width-members-in-fake_msg.patch | 72 ++++++++++++
PKGBUILD | 93 ++++++++--------
fakeroot.install | 22 +--
3 files changed, 133 insertions(+), 54 deletions(-)
Copied: lib32-fakeroot/repos/multilib-x86_64/0001-Revert-Use-fixed-width-members-in-fake_msg.patch (from rev 821568, lib32-fakeroot/trunk/0001-Revert-Use-fixed-width-members-in-fake_msg.patch)
===================================================================
--- 0001-Revert-Use-fixed-width-members-in-fake_msg.patch (rev 0)
+++ 0001-Revert-Use-fixed-width-members-in-fake_msg.patch 2021-01-17 18:40:10 UTC (rev 821569)
@@ -0,0 +1,72 @@
+From ffba4a8941a5f11748a9d305bf76691e7a2aa296 Mon Sep 17 00:00:00 2001
+From: Johannes 'josch' Schauer <josch at mister-muffin.de>
+Date: Tue, 3 Nov 2020 00:55:40 +0100
+Subject: [PATCH] Revert "Use fixed-width members in fake_msg"
+
+This reverts commit 2a53909e732b19ccbaf6d1534e932dff74fa757e.
+---
+ message.h | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/message.h b/message.h
+index 6fad1fb..9dfce94 100644
+--- a/message.h
++++ b/message.h
+@@ -48,7 +48,9 @@ typedef uint32_t fake_gid_t;
+ typedef uint32_t fake_mode_t;
+ typedef uint32_t fake_nlink_t;
+
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fakestat {
+ fake_uid_t uid;
+ fake_gid_t gid;
+@@ -58,32 +60,42 @@ struct fakestat {
+ fake_mode_t mode;
+ fake_nlink_t nlink;
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+
+ #define MAX_IPC_BUFFER_SIZE 1024
+
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fakexattr {
+ uint32_t buffersize;
+ char buf[MAX_IPC_BUFFER_SIZE];
+ int32_t flags_rc; /* flags from setxattr. Return code on round trip */
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fake_msg {
+ #ifndef FAKEROOT_FAKENET
+- int64_t mtype; /* message type in SYSV message sending */
++ long mtype; /* message type in SYSV message sending */
+ #endif
+ func_id_t id; /* the requested function */
+ #ifndef FAKEROOT_FAKENET
+ pid_t pid;
+- int32_t serial;
++ int serial;
+ #endif
+ struct fakestat st;
+ struct fakexattr xattr;
+ uint32_t remote;
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+
+ #endif
+--
+2.27.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-01-17 18:39:57 UTC (rev 821568)
+++ PKGBUILD 2021-01-17 18:40:10 UTC (rev 821569)
@@ -1,43 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Jochem Kossen <j.kossen at home.nl>
-
-_pkgbasename=fakeroot
-pkgname=lib32-${_pkgbasename}
-pkgver=1.25.3
-pkgrel=1
-pkgdesc='Tool for simulating superuser privileges (32-bit)'
-arch=('x86_64')
-license=('GPL')
-url="https://tracker.debian.org/pkg/fakeroot"
-groups=('multilib-devel')
-install=fakeroot.install
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('po4a')
-source=("https://deb.debian.org/debian/pool/main/f/${_pkgbasename}/${_pkgbasename}_${pkgver}.orig.tar.gz")
-sha512sums=('b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd ${_pkgbasename}-${pkgver}
- ./bootstrap
- ./configure --prefix=/usr --libdir=/usr/lib32/libfakeroot \
- --disable-static --with-ipc=sysv
- make
-
- cd doc
- po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg
-}
-
-package() {
- cd ${_pkgbasename}-${pkgver}
- make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/{bin,share}
-
- install -dm0755 "$pkgdir"/etc/ld.so.conf.d/
- echo '/usr/lib32/libfakeroot' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
-}
Copied: lib32-fakeroot/repos/multilib-x86_64/PKGBUILD (from rev 821568, lib32-fakeroot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-01-17 18:40:10 UTC (rev 821569)
@@ -0,0 +1,50 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Jochem Kossen <j.kossen at home.nl>
+
+_pkgbasename=fakeroot
+pkgname=lib32-${_pkgbasename}
+pkgver=1.25.3
+pkgrel=2
+pkgdesc='Tool for simulating superuser privileges (32-bit)'
+arch=('x86_64')
+license=('GPL')
+url="https://tracker.debian.org/pkg/fakeroot"
+groups=('multilib-devel')
+install=fakeroot.install
+depends=('lib32-glibc' "$_pkgbasename")
+makedepends=('po4a')
+source=("https://deb.debian.org/debian/pool/main/f/${_pkgbasename}/${_pkgbasename}_${pkgver}.orig.tar.gz"
+ 0001-Revert-Use-fixed-width-members-in-fake_msg.patch)
+sha512sums=('b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e'
+ 'c847b8178c7a6818718b4b83324887bc53668f008984fdd6cfb93470a759878c0c249c81a7250d49bd1519b95b9a80297bcee5a7125c351d9cd188c66b11e766')
+
+prepare() {
+ # https://bugs.archlinux.org/task/69189
+ patch -d $_pkgbasename-$pkgver -p1 < 0001-Revert-Use-fixed-width-members-in-fake_msg.patch
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd ${_pkgbasename}-${pkgver}
+ ./bootstrap
+ ./configure --prefix=/usr --libdir=/usr/lib32/libfakeroot \
+ --disable-static --with-ipc=sysv
+ make
+
+ cd doc
+ po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg
+}
+
+package() {
+ cd ${_pkgbasename}-${pkgver}
+ make DESTDIR="$pkgdir" install
+ rm -rf "$pkgdir"/usr/{bin,share}
+
+ install -dm0755 "$pkgdir"/etc/ld.so.conf.d/
+ echo '/usr/lib32/libfakeroot' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
+}
Deleted: fakeroot.install
===================================================================
--- fakeroot.install 2021-01-17 18:39:57 UTC (rev 821568)
+++ fakeroot.install 2021-01-17 18:40:10 UTC (rev 821569)
@@ -1,11 +0,0 @@
-post_install() {
- usr/bin/ldconfig -r .
-}
-
-post_upgrade() {
- usr/bin/ldconfig -r .
-}
-
-pre_remove() {
- usr/bin/ldconfig -r .
-}
Copied: lib32-fakeroot/repos/multilib-x86_64/fakeroot.install (from rev 821568, lib32-fakeroot/trunk/fakeroot.install)
===================================================================
--- fakeroot.install (rev 0)
+++ fakeroot.install 2021-01-17 18:40:10 UTC (rev 821569)
@@ -0,0 +1,11 @@
+post_install() {
+ usr/bin/ldconfig -r .
+}
+
+post_upgrade() {
+ usr/bin/ldconfig -r .
+}
+
+pre_remove() {
+ usr/bin/ldconfig -r .
+}
More information about the arch-commits
mailing list