2 Commits 0f25967d38 ... 6cdaf68863

Author SHA1 Message Date
  Jaidyn Levesque 6cdaf68863 Update xenodm patching 6 years ago
  Jaidyn Levesque 0a8c985c29 Added 6.3 and 6.4 keys 6 years ago

+ 2 - 0
files/keys/libertybsd-63-base.pub

@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWScj7nAM8a2OzBFGFk0mTPY2fOJzwSfBy9DZcN6XFwzSlRwltru2Fkg

+ 2 - 0
files/keys/libertybsd-63-pkg.pub

@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWTsehJvoYjbEZAJHRO1t73YpUPdbGPd/TUEb1E73WsmXnzTrPW5P30n

+ 2 - 0
files/keys/libertybsd-63-syspatch.pub

@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWS0ub6AJ8hWacYIMmhOt0VLrftCC6nnX+KmMjShjr2VeYQfd2WLcpTE

+ 2 - 0
files/keys/libertybsd-64-base.pub

@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWRPv4eDle0GvhTkw2XiZND9AsZdsTzkFx6j0Pz9QqasGNRKPTpGMn0A

+ 2 - 0
files/keys/libertybsd-64-pkg.pub

@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWRqzAO527E/98z+P0TyYTlqsRlW7dPa3AMh3yPxdb3uxoTFhn6FLThY

+ 2 - 0
files/keys/libertybsd-64-syspatch.pub

@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWS91qx0uxsZIJpJHeU0FAWA3Ykg4rSM/EpCZrHO1cM8KB7zITOFri6C

+ 6 - 7
src_rebrand.sh

@@ -88,7 +88,6 @@ lineadd "openbsd) osname=openbsd" "$(space 23) osvers=\"\$3\"" gnu/usr.bin/perl/
 rep "osname=openbsd" "osname=libertybsd" gnu/usr.bin/perl/Configure
 rep "interix|dragonfly|bitrig" "libertybsd|interix|dragonfly|bitrig" gnu/usr.bin/perl/Configure
 rep "dragonfly\*|bitrig*" "libertybsd\*|dragonfly\*|bitrig\*" gnu/usr.bin/perl/Makefile.SH
-rep "-openbsd" "-libertybsd" gnu/usr.bin/perl/Makefile.bsd-wrapper
 filecp gnu/usr.bin/perl/hints/openbsd.sh gnu/usr.bin/perl/hints/libertybsd.sh
 
 
@@ -102,14 +101,14 @@ filecp files/keys/libertybsd-61-syspatch.pub etc/signify/libertybsd-61-syspatch.
 filecp files/keys/libertybsd-62-base.pub etc/signify/libertybsd-62-base.pub
 filecp files/keys/libertybsd-62-pkg.pub etc/signify/libertybsd-62-pkg.pub
 filecp files/keys/libertybsd-62-syspatch.pub etc/signify/libertybsd-62-syspatch.pub
-
-linedel "./etc/signify/openbsd-59-pkg.pub" distrib/sets/lists/base/mi
-linedel "./etc/signify/openbsd-60-base.pub" distrib/sets/lists/base/mi
-linedel "./etc/signify/openbsd-60-fw.pub" distrib/sets/lists/base/mi
-linedel "./etc/signify/openbsd-60-pkg.pub" distrib/sets/lists/base/mi
+filecp files/keys/libertybsd-63-base.pub etc/signify/libertybsd-63-base.pub
+filecp files/keys/libertybsd-63-pkg.pub etc/signify/libertybsd-63-pkg.pub
+filecp files/keys/libertybsd-63-syspatch.pub etc/signify/libertybsd-63-syspatch.pub
+filecp files/keys/libertybsd-64-base.pub etc/signify/libertybsd-64-base.pub
+filecp files/keys/libertybsd-64-pkg.pub etc/signify/libertybsd-64-pkg.pub
+filecp files/keys/libertybsd-64-syspatch.pub etc/signify/libertybsd-64-syspatch.pub
 
 rep "openbsd-" "libertybsd-" distrib/sets/lists/base/mi
-rep "-59-base.pub" "-59.pub" distrib/sets/lists/base/mi
 
 
 filecp files/motd etc/motd

+ 3 - 15
xenocara_rebrand.sh

@@ -35,27 +35,15 @@ lineadd "\*:OpenBSD:\*:)" "exit;;" app/twm/config.guess
 lineadd "\*:OpenBSD:\*:)" "echo \${UNAME_MACHINE_ARCH}-unknown-openbsd\${UNAME_RELEASE}" app/twm/config.guess
 lineadd "\*:OpenBSD:\*:)" "UNAME_MACHINE_ARCH=\`arch | sed 's/OpenBSD.//'\`" app/twm/config.guess
 
-filecp files/pixmaps/LibertyBSD_15bpp.xpm app/xdm/config/LibertyBSD_15bpp.xpm
-filecp files/pixmaps/LibertyBSD_1bpp.xpm app/xdm/config/LibertyBSD_1bpp.xpm
-filecp files/pixmaps/LibertyBSD_4bpp.xpm app/xdm/config/LibertyBSD_4bpp.xpm
-filecp files/pixmaps/LibertyBSD_8bpp.xpm app/xdm/config/LibertyBSD_8bpp.xpm
-
 filecp files/pixmaps/LibertyBSD_15bpp.xpm app/xenodm/config/LibertyBSD_15bpp.xpm
 filecp files/pixmaps/LibertyBSD_1bpp.xpm app/xenodm/config/LibertyBSD_1bpp.xpm
 filecp files/pixmaps/LibertyBSD_4bpp.xpm app/xenodm/config/LibertyBSD_4bpp.xpm
 filecp files/pixmaps/LibertyBSD_8bpp.xpm app/xenodm/config/LibertyBSD_8bpp.xpm
 
-rep "BITMAPDIR/\*\*//OpenBSD" "BITMAPDIR/**//LibertyBSD" app/xdm/config/Xresources.cpp
-rep "--with-color-pixmap=OpenBSD" "--with-color-pixmap=LibertyBSD" app/xdm/Makefile.bsd-wrapper
-rep "--with-bw-pixmap=OpenBSD" "--with-bw-pixmap=LibertyBSD" app/xdm/Makefile.bsd-wrapper
-rep "/config/OpenBSD_" "/config/LibertyBSD_" app/xdm/Makefile.bsd-wrapper
-
-rep "BITMAPDIR/\*\*//OpenBSD" "BITMAPDIR/**//LibertyBSD" app/xenodm/config/Xresources.cpp
-rep "--with-color-pixmap=OpenBSD" "--with-color-pixmap=LibertyBSD" app/xenodm/Makefile.bsd-wrapper
-rep "--with-bw-pixmap=OpenBSD" "--with-bw-pixmap=LibertyBSD" app/xenodm/Makefile.bsd-wrapper
-rep "/config/OpenBSD_" "/config/LibertyBSD_" app/xenodm/Makefile.bsd-wrapper
-rep "OpenBSD_" "LibertyBSD_" app/xenodm/config/Makefile.am
+rep "OpenBSD_" "LibertyBSD_" app/xenodm/config/Xresources.in
 rep "OpenBSD_" "LibertyBSD_" app/xenodm/config/Makefile.in
+rep "OpenBSD_" "LibertyBSD_" app/xenodm/config/Makefile.am
+rep "OpenBSD_" "LibertyBSD_" app/xenodm/Makefile.bsd-wrapper
 
 rep "pixmaps/OpenBSD" "pixmaps/LibertyBSD" distrib/sets/lists/xshare/mi