This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
if [ -z "$1" ]; then | |
echo "Usage: import_auth_keys /path/to/authorized_keys.asc" | |
exit 1 | |
fi | |
gpg --verify "$1" | |
read -r -p "Import authorized_keys file? [y/N] " resp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1) Create a branch with the tag | |
git branch {tagname}-branch {tagname} | |
git checkout {tagname}-branch | |
2) Include the fix manually if it's just a change .... | |
git add . | |
git ci -m "Fix included" | |
or cherry-pick the commit, whatever is easier | |
git cherry-pick {num_commit} | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 16191998bc9ae59b6740ae96f3c1a935d7554d65 Mon Sep 17 00:00:00 2001 | |
From: Clayton Craft <[email protected]> | |
Date: Mon, 19 Mar 2018 22:25:52 +0000 | |
Subject: [PATCH 1/2] Fix compilation on musl | |
This relied on __GLIBC__ to omit glibc-specific things so that | |
compilation will not fail on musl | |
--- | |
src/glx/glx.c | 6 ++++-- | |
src/util/ring.c | 4 +++- |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From c3c7d493e6d5c65d269dedee0a3e06323a7a6013 Mon Sep 17 00:00:00 2001 | |
From: Clayton Craft <[email protected]> | |
Date: Mon, 19 Mar 2018 22:28:12 +0000 | |
Subject: [PATCH 2/2] Stub glXQueryDrawable | |
This is required by glxgears, though keep in mind that glxgears | |
may need this to be implemented to actually work.. | |
--- | |
src/glx/glx.c | 3 +++ | |
1 file changed, 3 insertions(+) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 6b49ab452350148df4a2c362d8fdfb8f3356e43e Mon Sep 17 00:00:00 2001 | |
From: Clayton Craft <[email protected]> | |
Date: Mon, 19 Mar 2018 22:34:35 +0000 | |
Subject: [PATCH] Work around recursion issue with glMaterialfv | |
This works around an issue that seems to be related to how musl | |
is linking libraries, causing an infinite recursive loop to form | |
--- | |
src/gles/light.c | 8 ++++++-- | |
1 file changed, 6 insertions(+), 2 deletions(-) |
OlderNewer