2 Commits 698e9ce2d6 ... 1d7cabcb5c

Author SHA1 Message Date
  Jaidyn Levesque 1d7cabcb5c Remove files/uname-obsd/ 6 years ago
  Jaidyn Levesque 16db2266cd Move version to 6.2 6 years ago

+ 1 - 1
files/root.mail

@@ -3,7 +3,7 @@ Return-Path: root
 Date: May  1 07:59:59 MST 2016
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to [LibertyBSD] 6.1!
+Subject: Welcome to [LibertyBSD] 6.2!
 
 This message attempts to describe the most basic initial questions that a
 system administrator of a [LibertyBSD] box might have.  You are urged to save

+ 0 - 5
files/uname-obsd/Makefile

@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:42:06 deraadt Exp $
-
-PROG=	uname-obsd
-
-.include <bsd.prog.mk>

+ 0 - 4
files/uname-obsd/cvs/Entries

@@ -1,4 +0,0 @@
-/Makefile/1.2/Wed Jun 26 05:42:06 1996//TOPENBSD_6_1
-/uname.1/1.17/Fri Oct 21 14:48:02 2011//TOPENBSD_6_1
-/uname.c/1.19/Fri Oct 28 07:22:59 2016//TOPENBSD_6_1
-D

+ 0 - 1
files/uname-obsd/cvs/Repository

@@ -1 +0,0 @@
-src/usr.bin/uname

+ 0 - 1
files/uname-obsd/cvs/Root

@@ -1 +0,0 @@
-anoncvs@anoncvs.openbsd.org:/cvs

+ 0 - 1
files/uname-obsd/cvs/Tag

@@ -1 +0,0 @@
-TOPENBSD_6_1

+ 0 - 91
files/uname-obsd/uname-obsd.1

@@ -1,91 +0,0 @@
-.\"	$OpenBSD: uname.1,v 1.17 2011/10/21 14:48:02 ajacoutot Exp $
-.\"
-.\" Copyright (c) 1990 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     from: @(#)du.1	6.13 (Berkeley) 6/20/91
-.\"
-.Dd $Mdocdate: October 21 2011 $
-.Dt UNAME-OBSD 1
-.Os
-.Sh NAME
-.Nm uname-obsd
-.Nd print operating system name as if it were OpenBSD
-.Sh SYNOPSIS
-.Nm uname-obsd
-.Op Fl amnprsv
-.Sh DESCRIPTION
-The
-.Nm uname-obsd
-utility operates in exactly the same way as
-.Xr uname 1
-except that the operating system name is printed as "OpenBSD".
-.Pp
-This is useful when building software that checks the operating
-system's name using
-.Xr uname 1
-but doesn't know about LibertyBSD. And example of this is the GNU
-build system's config.guess/config.sub files.
-.Pp
-To use uname-obsd when building, simply issue the command
-.D1 alias uname=/usr/bin/uname-obsd
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl a
-Behave as though all of the options
-.Fl mnrsv
-were specified.
-.It Fl m
-Print the machine hardware name.
-.It Fl n
-Print the nodename (the nodename may be a name
-that the system is known by to a communications
-network).
-.It Fl p
-Print the machine processor architecture name.
-.It Fl r
-Print the operating system release.
-.It Fl s
-Print "OpenBSD".
-.It Fl v
-Print the operating system version.
-.El
-.Pp
-If no options are specified,
-.Nm uname
-prints "OpenBSD", as if the
-.Fl s
-option had been specified.
-.Sh EXIT STATUS
-.Ex -std uname-obsd
-.Sh SEE ALSO
-.Xr uname-obsd 1
-.Sh HISTORY
-The
-.Nm
-command first appeared in LibertyBSD 5.8.

+ 0 - 144
files/uname-obsd/uname-obsd.c

@@ -1,144 +0,0 @@
-/*	$OpenBSD: uname.c,v 1.19 2016/10/28 07:22:59 schwarze Exp $	*/
-
-/*
- * Copyright (c) 1994 Winning Strategies, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Winning Strategies, Inc.
- * 4. The name of Winning Strategies, Inc. may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>	/* MACHINE_ARCH */
-#include <sys/utsname.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-static void __dead usage(void);
-
-#define	PRINT_SYSNAME		0x01
-#define	PRINT_NODENAME		0x02
-#define	PRINT_RELEASE		0x04
-#define	PRINT_VERSION		0x08
-#define	PRINT_MACHINE		0x10
-#define	PRINT_ALL		0x1f
-#define PRINT_MACHINE_ARCH	0x20
-
-int
-main(int argc, char *argv[])
-{
-	struct utsname u;
-	int c;
-	int space = 0;
-	int print_mask = 0;
-
-	if (pledge("stdio", NULL) == -1)
-		err(1, "pledge");
-
-	while ((c = getopt(argc, argv, "amnrsvp")) != -1 ) {
-		switch (c) {
-		case 'a':
-			print_mask |= PRINT_ALL;
-			break;
-		case 'm':
-			print_mask |= PRINT_MACHINE;
-			break;
-		case 'n':
-			print_mask |= PRINT_NODENAME;
-			break;
-		case 'p':
-			print_mask |= PRINT_MACHINE_ARCH;
-			break;
-		case 'r':
-			print_mask |= PRINT_RELEASE;
-			break;
-		case 's':
-			print_mask |= PRINT_SYSNAME;
-			break;
-		case 'v':
-			print_mask |= PRINT_VERSION;
-			break;
-		default:
-			usage();
-		}
-	}
-
-	if (optind != argc)
-		usage();
-
-	if (!print_mask)
-		print_mask = PRINT_SYSNAME;
-
-	if (uname(&u) == -1)
-		err(1, NULL);
-
-	if (print_mask & PRINT_SYSNAME) {
-		space++;
-		fputs("OpenBSD", stdout);
-	}
-	if (print_mask & PRINT_NODENAME) {
-		if (space++)
-			putchar(' ');
-
-		fputs(u.nodename, stdout);
-	}
-	if (print_mask & PRINT_RELEASE) {
-		if (space++)
-			putchar(' ');
-
-		fputs(u.release, stdout);
-	}
-	if (print_mask & PRINT_VERSION) {
-		if (space++)
-			putchar(' ');
-
-		fputs(u.version, stdout);
-	}
-	if (print_mask & PRINT_MACHINE) {
-		if (space++)
-			putchar(' ');
-
-		fputs(u.machine, stdout);
-	}
-	if (print_mask & PRINT_MACHINE_ARCH) {
-		if (space++)
-			putchar(' ');
-
-		fputs(MACHINE_ARCH, stdout);
-	}
-	putchar('\n');
-
-	return 0;
-}
-
-static void __dead
-usage(void)
-{
-	fprintf(stderr, "usage: uname [-amnprsv]\n");
-	exit(1);
-}

+ 2 - 2
xenocara_rebrand.sh

@@ -63,7 +63,7 @@ lineadd "*:OpenBSD:*:*)" "*:LibertyBSD:*:*)" font/util/config.guess
 lineadd "*:OpenBSD:*:*)" "        exit ;;" font/util/config.guess
 lineadd "*:OpenBSD:*:*)" "        echo \${UNAME_MACHINE_ARCH}-unknown-openbsd\${UNAME_RELEASE}" font/util/config.guess
 lineadd "*:OpenBSD:*:*)" "        UNAME_MACHINE_ARCH=\`arch | sed 's/OpenBSD.//'\`" font/util/config.guess
-rep "sh " "build_alias=\${MACHINE_ARCH}-unknown-openbsd6.1  sh " app/xlockmore/Makefile.bsd-wrapper
-rep "exec sh " "build_alias=\${MACHINE_ARCH}-unknown-openbsd6.1  exec sh " share/mk/bsd.xorg.mk
+rep "sh " "build_alias=\${MACHINE_ARCH}-unknown-openbsd6.2  sh " app/xlockmore/Makefile.bsd-wrapper
+rep "exec sh " "build_alias=\${MACHINE_ARCH}-unknown-openbsd6.2  exec sh " share/mk/bsd.xorg.mk
 
 apply