chris-se

From 119b1112825b76fa74fd38372af70484ddf7065e Mon Sep 17 00:00:00 2001
From: Christian Seiler <[email protected]>
Date: Tue, 15 Jul 2014 17:14:10 +0200
Subject: [PATCH] Respect EDITOR and PAGER environment variables

Make crmsh properly respect EDITOR and PAGER environment variables,
which did not work properly before.
---
 modules/config.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

chris-se

diff --git a/gtk3-nocsd.c b/gtk3-nocsd.c
index 255bc46..cae6487 100644
--- a/gtk3-nocsd.c
+++ b/gtk3-nocsd.c
@@ -24,8 +24,10 @@
 #include <dlfcn.h>
 #include <unistd.h>
 #include <string.h>
+#include <stdlib.h>
 

chris-se

/*
 * Author: Christian Seiler <[email protected]>
 * License: GPLv3+
 *
 * IMPORTANT NOTE:
 * This was just a proof of concept, there's a better version available from
 * https://github.com/chris-se/tiny-initrd
 *
 * Usage: musl-gcc -O2 -Wall -Wextra -static -o init simple_initrd.c
 *        mkdir initramfs initramfs/{dev,proc,target}

chris-se

CC=gcc
CFLAGS=-Wall -Wextra -O2 -ggdb
#CPPFLAGS=-DCRYPTTAB_FILE=\"/tmp/crypttab\"

all: keyscript-generator systemd-keyscript-cryptsetup

keyscript-generator: keyscript-generator.o sd-functions.o

systemd-keyscript-cryptsetup: systemd-keyscript-cryptsetup.o

chris-se

Index: s390/syscalls.h
===================================================================
RCS file: /cvs/dietlibc/s390/syscalls.h,v
retrieving revision 1.13
diff -u -r1.13 syscalls.h
--- s390/syscalls.h	6 Oct 2014 19:58:07 -0000	1.13
+++ s390/syscalls.h	31 Jan 2016 12:25:29 -0000
@@ -9,7 +9,7 @@
 #define __NR_write		  4
 #define __NR_open		  5

chris-se

Index: lib/stackgap.c
===================================================================
RCS file: /cvs/dietlibc/lib/stackgap.c,v
retrieving revision 1.30
diff -u -p -r1.30 stackgap.c
--- lib/stackgap.c	26 Jan 2016 15:08:00 -0000	1.30
+++ lib/stackgap.c	6 Feb 2016 23:10:28 -0000
@@ -127,12 +127,19 @@ void __setup_tls(tcbhead_t* mainthread) 
 
 #elif defined(__alpha__) || defined(__s390__)

chris-se

Index: libpthread/pthread_internal.c
===================================================================
RCS file: /cvs/dietlibc/libpthread/pthread_internal.c,v
retrieving revision 1.24
diff -u -p -r1.24 pthread_internal.c
--- libpthread/pthread_internal.c	21 Feb 2014 10:03:29 -0000	1.24
+++ libpthread/pthread_internal.c	6 Feb 2016 23:13:53 -0000
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #endif

chris-se

Index: x86_64/__testandset.S
===================================================================
RCS file: /cvs/dietlibc/x86_64/__testandset.S,v
retrieving revision 1.3
diff -u -p -r1.3 __testandset.S
--- x86_64/__testandset.S	25 Jan 2016 19:04:48 -0000	1.3
+++ x86_64/__testandset.S	7 Feb 2016 00:31:29 -0000
@@ -9,7 +9,5 @@
 __testandset:
 	xorl	%eax,%eax

chris-se

chris-se