[rarpd] fixed rarpd-ss981107.patch to be apply-able fixed some rpmlint errors
Jan Horak
hhorak at fedoraproject.org
Fri Aug 5 08:36:31 UTC 2011
commit b96c5c32c6e10025e53143ec5131873eed2948f3
Author: Honza Horák <hhorak at redhat.com>
Date: Fri Aug 5 10:36:14 2011 +0200
fixed rarpd-ss981107.patch to be apply-able
fixed some rpmlint errors
rarpd-ss981107.patch | 227 --------------------------------------------------
rarpd.spec | 19 +++--
2 files changed, 13 insertions(+), 233 deletions(-)
---
diff --git a/rarpd-ss981107.patch b/rarpd-ss981107.patch
index f35127b..fc92d56 100644
--- a/rarpd-ss981107.patch
+++ b/rarpd-ss981107.patch
@@ -9,233 +9,6 @@
all: rarpd
---- rarpd/ethernet.c.jj Fri Nov 6 16:17:42 1998
-+++ rarpd/ethernet.c Thu Jan 1 01:00:00 1970
-@@ -1,224 +0,0 @@
--/*
-- * Copyright (c) 1990, 1993 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: (1) source code distributions
-- * retain the above copyright notice and this paragraph in its entirety, (2)
-- * distributions including binary code include the above copyright notice and
-- * this paragraph in its entirety in the documentation or other materials
-- * provided with the distribution, and (3) all advertising materials mentioning
-- * features or use of this software display the following acknowledgement:
-- * ``This product includes software developed by the University of California,
-- * Lawrence Berkeley Laboratory and its contributors.'' 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-- */
--#ifndef lint
--static char rcsid[] =
-- "@(#) $Header: /home/fedora/jkeating/pkgs/rpms/rarpd/devel/rarpd-ss981107.patch,v 1.1 2004/09/09 11:05:49 cvsdist Exp $ (LBL)";
--#endif
--
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <sys/time.h>
--
--#include <ctype.h>
--#include <stdio.h>
--#include <string.h>
--
--#ifndef ETHERS_FILE
--#define ETHERS_FILE "/etc/ethers"
--#endif
--
--struct etherent {
-- u_char addr[6];
-- char name[122];
--};
--
--static FILE *ether_fp = NULL;
--
--
--/* Hex digit to integer. */
--static inline int
--xdtoi(c)
-- int c;
--{
--
-- if (isdigit(c))
-- return c - '0';
-- else if (islower(c))
-- return c - 'a' + 10;
-- else
-- return c - 'A' + 10;
--}
--
--static inline int
--skip_space(f)
-- FILE *f;
--{
-- int c;
--
-- do {
-- c = getc(f);
-- } while (isspace(c) && c != '\n');
--
-- return c;
--}
--
--static inline int
--skip_line(f)
-- FILE *f;
--{
-- int c;
--
-- do
-- c = getc(f);
-- while (c != '\n' && c != EOF);
--
-- return c;
--}
--
--static struct etherent *
--next_etherent(fp)
-- FILE *fp;
--{
-- register int c, d, i;
-- char *bp;
-- static struct etherent e;
-- static int nline = 1;
-- top:
-- while (nline) {
-- /* Find addr */
-- c = skip_space(fp);
-- if (c == '\n')
-- continue;
-- /* If this is a comment, or first thing on line
-- cannot be etehrnet address, skip the line. */
-- else if (!isxdigit(c))
-- c = skip_line(fp);
-- else {
-- /* must be the start of an address */
-- for (i = 0; i < 6; i += 1) {
-- d = xdtoi(c);
-- c = getc(fp);
-- if (c != ':') {
-- d <<= 4;
-- d |= xdtoi(c);
-- c = getc(fp);
-- }
-- e.addr[i] = d;
-- if (c != ':')
-- break;
-- c = getc(fp);
-- }
-- nline = 0;
-- }
-- if (c == EOF)
-- return NULL;
-- }
--
-- /* If we started a new line, 'c' holds the char past the ether addr,
-- which we assume is white space. If we are continuing a line,
-- 'c' is garbage. In either case, we can throw it away. */
--
-- c = skip_space(fp);
-- if (c == '\n') {
-- nline = 1;
-- goto top;
-- }
-- else if (c == '#') {
-- (void)skip_line(fp);
-- nline = 1;
-- goto top;
-- }
-- else if (c == EOF)
-- return NULL;
--
-- /* Must be a name. */
-- bp = e.name;
-- /* Use 'd' to prevent buffer overflow. */
-- d = sizeof(e.name) - 1;
-- do {
-- *bp++ = c;
-- c = getc(fp);
-- } while (!isspace(c) && c != EOF && --d > 0);
-- *bp = '\0';
-- if (c == '\n')
-- nline = 1;
--
-- return &e;
--}
--
--/* Open/rewind the ethers files; returns 1 if file was reopened */
--int
--ether_rewind()
--{
-- struct stat st;
-- static long mtime = 0, ctime = 0;
--
-- if (ether_fp != NULL) {
-- if (fstat(fileno(ether_fp), &st) < 0 ||
-- mtime != st.st_mtime || ctime != st.st_ctime ||
-- fseek(ether_fp, 0L, SEEK_SET) < 0) {
-- fclose(ether_fp);
-- ether_fp = NULL;
-- }
-- }
-- if (ether_fp == NULL) {
-- ether_fp = fopen(ETHERS_FILE, "r");
-- if (ether_fp == NULL)
-- return (-1);
-- if (fstat(fileno(ether_fp), &st) < 0) {
-- fclose(ether_fp);
-- ether_fp = NULL;
-- return (-1);
-- }
-- mtime = st.st_mtime;
-- ctime = st.st_ctime;
-- return (1);
-- }
-- return (0);
--}
--
--/* Map an ethernet address to a name; returns 0 on success, else 1. */
--int
--ether_ntohost(name, ea)
-- register char *name;
-- register u_char *ea;
--{
-- register struct etherent *ep;
--
-- if (ether_rewind() < 0)
-- return (1);
--
-- while ((ep = next_etherent(ether_fp)) != NULL)
-- if (bcmp(ep->addr, ea, 6) == 0) {
-- strcpy(name, ep->name);
-- return (0);
-- }
-- return (1);
--}
--
--/* Map an ethernet name to an address; returns 0 on success, else 1. */
--int
--ether_hostton(name, ea)
-- register char *name;
-- register u_char *ea;
--{
-- register struct etherent *ep;
--
-- if (ether_rewind() < 0)
-- return (1);
--
-- while ((ep = next_etherent(ether_fp)) != NULL)
-- if (strcmp(ep->name, name) == 0) {
-- bcopy(ep->addr, ea, 6);
-- return (0);
-- }
-- return (1);
--}
--- rarpd/rarpd.8.jj Thu Jan 1 01:00:00 1970
+++ rarpd/rarpd.8 Fri Apr 7 10:47:16 2000
@@ -0,0 +1,69 @@
diff --git a/rarpd.spec b/rarpd.spec
index 0be396b..652cd81 100644
--- a/rarpd.spec
+++ b/rarpd.spec
@@ -1,7 +1,7 @@
-Summary: The RARP daemon.
+Summary: The RARP daemon
Name: rarpd
Version: ss981107
-Release: 31%{?dist}
+Release: 32%{?dist}
License: GPLv2+
Group: System Environment/Daemons
Source: ftp://ftp.inr.ac.ru/ip-routing/dhcp.bootp.rarp/rarpd-%{version}.tar.gz
@@ -12,7 +12,10 @@ Patch3: rarpd-fd-leak.patch
Patch4: rarpd-sprintf.patch
Patch5: rarpd-initLSB.patch
Patch6: rarpd-configurableInit.patch
-Prereq: /sbin/chkconfig
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
Buildroot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -47,11 +50,11 @@ make CFLAGS="$CFLAGS"
%install
rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d
+mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -m 755 rarpd.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/rarpd
+install -m 755 rarpd.init ${RPM_BUILD_ROOT}%{_initrddir}/rarpd
install -m 755 rarpd ${RPM_BUILD_ROOT}%{_sbindir}/rarpd
install -m 644 rarpd.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/rarpd.8
@@ -75,11 +78,15 @@ fi
%files
%defattr(-,root,root)
%doc README
-%config /etc/rc.d/init.d/rarpd
+%{_initrddir}/rarpd
%{_sbindir}/rarpd
%{_mandir}/man8/*
%changelog
+* Fri Aug 05 2011 Honza Horak <hhorak at redhat.com> - ss981107-32
+- fixed rarpd-ss981107.patch to be apply-able
+- fixed some rpmlint errors
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - ss981107-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list