debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hpversion.h from repository

Browse Source 
This patch removes hpversion.h from the repository, this also untangles a
lot of ifdef mess. This closes bug CDExc19524.
This commit is contained in:
chase
2018-10-05 15:26:13 -05:00
committed by Jon Trulson
parent 90a2b2848a
commit dd68514e4f
92 changed files with 115 additions and 1576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
cde/programs/dtlogin/Imakefile
View File

@@ -24,8 +24,7 @@ HEADERS = dm.h vg.h vglogo.h vgmsg.h vgproto.h
DESDEFS = -DHASDES -DHASXDMAUTH -DSILLYEXPORTRULE
DESOBJS = xdmauth.o
DESSRCS = xdmauth.c
#else
#if HasDESLibrary
#elif HasDESLibrary
DESDEFS = -DHASDES
DESOBJS = xdmauth.o
DESSRCS = xdmauth.c
@@ -34,7 +33,6 @@ DESDEFS =
DESOBJS =
DESSRCS =
#endif
#endif
#ifndef UsePamLibrary
# define UsePamLibrary NO
@@ -85,15 +83,14 @@ LOGINDEPXLIB = $(DEPXLIB)
LOGINXLIB = $(XLIB)
#ifdef HPArchitecture
# if (! defined(UseInstalled)) && (! defined(UseMitLibrariesFromSystemOnly))
# ifdef SHLIB
# if !defined(UseInstalled) && !defined(UseMitLibrariesFromSystemOnly) && \
defined(SHLIB)
LOGINDEPXMULIB = $(XMUSRC)/libXmu.a
LOGINXMULIB = $(LOGINDEPXMULIB)
LOGINDEPXLIB = $(XLIBSRC)/libX11.a
LOGINXLIB = $(LOGINDEPXLIB)
/* This is really a kludge !! */
LOGINLDOPTIONS = -Wl,-a archive
# endif
# endif
# if OSMajorVersion >= 10
SYS_LIBRARIES = -lsec
@@ -162,28 +159,22 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
SRCS1 = access.c account.c auth.c genauth.c daemon.c dm.c \
dpylist.c error.c file.c mitauth.c protodpy.c policy.c \
reset.c resource.c server.c session.c socket.c util.c \
verify.c version.c sysauth.c fontpath.c $(DESSRCS) \
qualify.c choose.c netaddr.c xdmcp.c \
$(PAM_SRCS) $(SOLARIS_SRCS)
verify.c sysauth.c fontpath.c $(DESSRCS) qualify.c choose.c \
netaddr.c xdmcp.c $(PAM_SRCS) $(SOLARIS_SRCS)
OBJS1 = access.o account.o auth.o genauth.o daemon.o dm.o \
dpylist.o error.o file.o mitauth.o protodpy.o policy.o \
reset.o resource.o server.o session.o socket.o util.o \
verify.o version.o sysauth.o fontpath.o $(DESOBJS) \
qualify.o choose.o netaddr.o xdmcp.o \
$(PAM_OBJS) $(SOLARIS_OBJS)
verify.o sysauth.o fontpath.o $(DESOBJS) qualify.o choose.o \
netaddr.o xdmcp.o $(PAM_OBJS) $(SOLARIS_OBJS)
PROG2 = dtgreet
#ifdef AlphaArchitecture
SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c \
vgversion.c vglang.c vgsiaform.c
OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o \
vgversion.o vglang.o vgsiaform.o
SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c vglang.c vgsiaform.c
OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o vglang.o vgsiaform.o
#else
SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c \
vgversion.c vglang.c
OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o \
vgversion.o vglang.o
SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c vglang.c
OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o vglang.o
#endif
PROG3 = dtchooser
@@ -324,12 +315,9 @@ EXTRA_RES_DEFINES = \
*
**************************************************************************/
#ifndef BLS
# ifdef HPArchitecture
# if (OSMajorVersion == 8) && (OSMinorVersion == 8)
# define BLS
# endif
# endif
#if !defined(BLS) && defined(HPArchitecture) && (OSMajorVersion == 8) && \
(OSMinorVersion == 8)
# define BLS
#endif
#ifdef BLS
@@ -461,11 +449,9 @@ vgutil.o:
#endif
SpecialObjectRule(resource.o, $(ICONFIGFILES), $(EXTRA_RES_DEFINES) $(RES_DEFINES) $(CCINLIBS))
#ifdef HPArchitecture
#ifndef DEBUGTREE
#if defined(HPArchitecture) && !defined(DEBUGTREE)
SpecialObjectRule(session.o,,+O1 $(CCINLIBS))
#endif
#endif
#if !defined(USE_KRB) && !defined(USE_RGY)
@@ -487,13 +473,10 @@ MakeDirectories(install,$(XDMDIR))
InstallProgramWithFlags(xdmshell,$(XBINDIR), /**/)
#endif
#if !defined(USE_KRB) && !defined(USE_RGY)
#if !defined(USE_KRB) && !defined(USE_RGY) && defined(BuildHugeObject) && \
defined(HPArchitecture) && !defined(BLS)
/***** For dtge make a client_OBJS.o using client_main.o ******/
/***** This implies the existence of client_main.c ******/
# ifdef BuildHugeObject
# if defined (HPArchitecture) && ! defined (BLS)
SpecialRelocatableTarget(dtlogin,$(HIDDEN_SYMBOLS1),$(OBJS1))
SpecialRelocatableTarget(dtgreet,$(HIDDEN_SYMBOLS2),$(OBJS2))
# endif
# endif
#endif

27
cde/programs/dtlogin/genauth.c
View File

@@ -106,25 +106,18 @@ extern int errno;
#define Time_t time_t
#endif
#ifndef DONT_USE_DES
# ifndef USE_CRYPT
# if defined(AIXV3) || defined(hpux) || defined(__FreeBSD__)
# define USE_CRYPT
# endif
# ifdef __OpenBSD__
# define DONT_USE_DES
# endif
# ifdef sun
# define USE_CRYPT
# if (OSMAJORVERSION >= 4)
/* avoid strange sun crypt hackery */
# define crypt _crypt
# endif
#if !defined(DONT_USE_DES) && !defined(USE_CRYPT)
# if defined(AIXV3) || defined(hpux) || defined(__FreeBSD__)
# define USE_CRYPT
# elif defined(__OpenBSD__)
# define DONT_USE_DES
# elif defined(sun)
# define USE_CRYPT
# if (OSMAJORVERSION >= 4)
/* avoid strange sun crypt hackery */
# define crypt _crypt
# endif
# endif
#endif
#if !defined (DONT_USE_DES) && !defined (USE_CRYPT)
# define USE_ENCRYPT
#endif

78
cde/programs/dtlogin/version.c
View File

@@ -1,78 +0,0 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
/* $XConsortium: version.c /main/6 1996/08/30 15:33:21 drk $
*
* (c) Copyright 1996 Digital Equipment Corporation.
* (c) Copyright 1993,1994,1996 Hewlett-Packard Company.
* (c) Copyright 1993,1994,1996 International Business Machines Corp.
* (c) Copyright 1993,1994,1996 Sun Microsystems, Inc.
* (c) Copyright 1993,1994,1996 Novell, Inc.
* (c) Copyright 1996 FUJITSU LIMITED.
* (c) Copyright 1996 Hitachi.
*/
/********************************************************
Copyright (c) 1988, 1990 by Hewlett-Packard Company
Copyright (c) 1988 by the Massachusetts Institute of Technology
Permission to use, copy, modify, and distribute this software
and its documentation for any purpose and without fee is hereby
granted, provided that the above copyright notice appear in all
copies and that both that copyright notice and this permission
notice appear in supporting documentation, and that the names of
Hewlett-Packard or M.I.T. not be used in advertising or publicity
pertaining to distribution of the software without specific, written
prior permission.
********************************************************/
#include <include/hpversion.h>
#ifndef lint
version_tag("dtlogin: $XConsortium: version.c /main/6 1996/08/30 15:33:21 drk $")
#ifdef __AFS
static char _afs_version[] = "@(#)AFS 3 Authentication";
#endif
#ifdef __KERBEROS
static char _krb_version[] = "@(#)Kerberos Authentication";
#endif
#ifdef __PASSWD_ETC
static char _rgy_version[] = "@(#)Passwd Etc. - Domain Registry Authentication";
#endif
#ifdef BLS
static char _bls_version[] = "@(#)HP BLS Authentication";
#endif
#endif /* lint */

78
cde/programs/dtlogin/vgversion.c
View File

@@ -1,78 +0,0 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
/* $XConsortium: vgversion.c /main/6 1996/08/30 15:34:13 drk $
*
* (c) Copyright 1996 Digital Equipment Corporation.
* (c) Copyright 1993,1994,1996 Hewlett-Packard Company.
* (c) Copyright 1993,1994,1996 International Business Machines Corp.
* (c) Copyright 1993,1994,1996 Sun Microsystems, Inc.
* (c) Copyright 1993,1994,1996 Novell, Inc.
* (c) Copyright 1996 FUJITSU LIMITED.
* (c) Copyright 1996 Hitachi.
*/
/********************************************************
Copyright (c) 1988, 1990 by Hewlett-Packard Company
Copyright (c) 1988 by the Massachusetts Institute of Technology
Permission to use, copy, modify, and distribute this software
and its documentation for any purpose and without fee is hereby
granted, provided that the above copyright notice appear in all
copies and that both that copyright notice and this permission
notice appear in supporting documentation, and that the names of
Hewlett-Packard or M.I.T. not be used in advertising or publicity
pertaining to distribution of the software without specific, written
prior permission.
********************************************************/
#include <include/hpversion.h>
#ifndef lint
version_tag("dtgreet: $XConsortium: vgversion.c /main/6 1996/08/30 15:34:13 drk $")
#ifdef __AFS
static char _afs_version[] = "@(#)AFS 3 Authentication";
#endif
#ifdef __KERBEROS
static char _krb_version[] = "@(#)Kerberos Authentication";
#endif
#ifdef __PASSWD_ETC
static char _rgy_version[] = "@(#)Passwd Etc. - Domain Registry Authentication";
#endif
#ifdef BLS
static char _bls_version[] = "@(#)HP BLS Authentication";
#endif
#endif /* lint */