From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CACA158043 for ; Sat, 20 Apr 2024 18:47:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EC1EE29D5; Sat, 20 Apr 2024 18:47:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58B53E29D5 for ; Sat, 20 Apr 2024 18:47:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0BC93433EA for ; Sat, 20 Apr 2024 18:47:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBD4A1747 for ; Sat, 20 Apr 2024 18:47:35 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1713638126.ef5d2d04637a845ec3fe26d7356cbb335c91db3f.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/minit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/minit/files/minit-0.10-fixes.diff X-VCS-Directories: sys-process/minit/files/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: ef5d2d04637a845ec3fe26d7356cbb335c91db3f X-VCS-Branch: master Date: Sat, 20 Apr 2024 18:47:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b03d0c4d-4421-4890-adbd-88fee42dd6e6 X-Archives-Hash: e41cea4b76c0e767964d7d9f8cabcf40 commit: ef5d2d04637a845ec3fe26d7356cbb335c91db3f Author: Arthur Zamarin gentoo org> AuthorDate: Sat Apr 20 18:35:26 2024 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Apr 20 18:35:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5d2d04 sys-process/minit: scrub-patch Signed-off-by: Arthur Zamarin gentoo.org> sys-process/minit/files/minit-0.10-fixes.diff | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/sys-process/minit/files/minit-0.10-fixes.diff b/sys-process/minit/files/minit-0.10-fixes.diff index 5c80091f84f3..49b67c67a282 100644 --- a/sys-process/minit/files/minit-0.10-fixes.diff +++ b/sys-process/minit/files/minit-0.10-fixes.diff @@ -1,13 +1,12 @@ -diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile ---- minit-0.10.orig/Makefile 2005-04-08 19:24:04.000000000 +0200 -+++ minit-0.10/Makefile 2008-11-27 23:05:57.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -7,7 +7,7 @@ CROSS= #CROSS=arm-linux- LDFLAGS=-s -MANDIR=/usr/man +MANDIR=/usr/share/man - + path = $(subst :, ,$(PATH)) diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) @@ -44,9 +44,11 @@ @@ -21,13 +20,13 @@ diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile +hard-reboot: hard-reboot.o +write_proc: write_proc.o +killall5: killall5.o - + %.o: %.c $(DIET) $(CROSS)$(CC) $(CFLAGS) -c $< @@ -61,22 +63,11 @@ test: test.c gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a - + -pidfilehack: pidfilehack.c - $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^ - @@ -49,14 +48,13 @@ diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile install msvc serdo $(DESTDIR)/bin install -m 4750 shutdown $(DESTDIR)/sbin test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init -diff -ru minit-0.10.orig/serdo.c minit-0.10/serdo.c ---- minit-0.10.orig/serdo.c 2005-02-26 18:00:22.000000000 +0100 -+++ minit-0.10/serdo.c 2008-11-27 23:02:57.000000000 +0100 +--- a/serdo.c ++++ b/serdo.c @@ -10,6 +10,7 @@ #define MAXENV 256 char* envp[MAXENV+2]; int envc; +extern char **environ; - + int continueonerror; - +