Navigation

← Previous Changeset
Next Changeset →

Changeset 172

Timestamp:

01/04/09 03:59:44 (16 years ago)

Author:

broder

Message:

Add a patch to Moira to fix com_err.

Files:

trunk/fink/main/finkinfo/macathena-moira.info (modified) (2 diffs)
trunk/fink/main/finkinfo/macathena-moira.patch (modified) (16 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/fink/main/finkinfo/macathena-moira.info

r152	r172
1	1	Package: macathena-moira
2	2	Version: 20080830
3		Revision: 1
	3	Revision: 2
4	4	Source: http://macathena.mit.edu/dist/moira-%v.tar.gz
5	5	Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
…	…
18	18	UpdateConfigGuess: true
19	19	PatchFile: %n.patch
20		PatchFile-MD5: ~~ddba5b97628f0cad674cd20bce153bde~~
21		PatchScript: patch -p0 < %{PatchFile}
	20	PatchFile-MD5: 7e555a88ae3cbec212434b5e0311e468
	21	PatchScript: patch -p1 < %{PatchFile}
22	22	ConfigureParams: --with-krb5 --with-com_err --with-hesiod
23	23	CompileScript: <<

trunk/fink/main/finkinfo/macathena-moira.patch

r152	r172
1		Index: Makefile.in
2		===================================================================
3		--- ~~Makefile.in 2007-02-14 01:59:19.000000000 -0500~~
4		+++ ~~Makefile.in 2007-02-14 02:06:36.000000000 -0500~~
	1	Index: moira/Makefile.in
	2	===================================================================
	3	--- moira.orig/Makefile.in
	4	+++ moira/Makefile.in
5	5	@@ -35,11 +35,11 @@
6	6	@for d in $(SUBDIRS); do (echo "### Making $@ in $$d"; cd $$d; $(MAKE) $@) \|\| exit 1; done
…	…
17	17
18	18	world: depend all
19		Index: clients/addusr/Makefile.in
20		===================================================================
21		--- ~~clients/addusr/Makefile.in 2007-02-14 01:59:19.000000000 -0500~~
22		+++ ~~clients/addusr/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	19	Index: moira/clients/addusr/Makefile.in
	20	===================================================================
	21	--- moira.orig/clients/addusr/Makefile.in
	22	+++ moira/clients/addusr/Makefile.in
23	23	@@ -40,7 +40,7 @@
24	24	depend:
…	…
30	30	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
31	31	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
32		Index: clients/blanche/Makefile.in
33		===================================================================
34		--- ~~clients/blanche/Makefile.in 2007-02-14 01:59:20.000000000 -0500~~
35		+++ ~~clients/blanche/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	32	Index: moira/clients/blanche/Makefile.in
	33	===================================================================
	34	--- moira.orig/clients/blanche/Makefile.in
	35	+++ moira/clients/blanche/Makefile.in
36	36	@@ -40,7 +40,7 @@
37	37	depend:
…	…
43	43	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
44	44	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
45		Index: clients/chfn/Makefile.in
46		===================================================================
47		--- ~~clients/chfn/Makefile.in 2007-02-14 01:59:20.000000000 -0500~~
48		+++ ~~clients/chfn/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	45	Index: moira/clients/chfn/Makefile.in
	46	===================================================================
	47	--- moira.orig/clients/chfn/Makefile.in
	48	+++ moira/clients/chfn/Makefile.in
49	49	@@ -40,7 +40,7 @@
50	50	depend:
…	…
56	56	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
57	57	$(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)
58		Index: clients/chpobox/Makefile.in
59		===================================================================
60		--- ~~clients/chpobox/Makefile.in 2007-02-14 01:59:20.000000000 -0500~~
61		+++ ~~clients/chpobox/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	58	Index: moira/clients/chpobox/Makefile.in
	59	===================================================================
	60	--- moira.orig/clients/chpobox/Makefile.in
	61	+++ moira/clients/chpobox/Makefile.in
62	62	@@ -40,7 +40,7 @@
63	63	depend:
…	…
69	69	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
70	70	$(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)
71		Index: clients/chsh/Makefile.in
72		===================================================================
73		--- ~~clients/chsh/Makefile.in 2007-02-14 01:59:20.000000000 -0500~~
74		+++ ~~clients/chsh/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	71	Index: moira/clients/chsh/Makefile.in
	72	===================================================================
	73	--- moira.orig/clients/chsh/Makefile.in
	74	+++ moira/clients/chsh/Makefile.in
75	75	@@ -40,7 +40,7 @@
76	76	depend:
…	…
82	82	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
83	83	$(CC) -o $@ $(LDFLAGS) $@.o $(LIBS)
84		Index: clients/mailmaint/Makefile.in
85		===================================================================
86		--- ~~clients/mailmaint/Makefile.in 2007-02-14 01:59:20.000000000 -0500~~
87		+++ ~~clients/mailmaint/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	84	Index: moira/clients/mailmaint/Makefile.in
	85	===================================================================
	86	--- moira.orig/clients/mailmaint/Makefile.in
	87	+++ moira/clients/mailmaint/Makefile.in
88	88	@@ -40,7 +40,7 @@
89	89	depend:
…	…
95	95	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
96	96	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
97		Index: clients/mitch/Makefile.in
98		===================================================================
99		--- ~~clients/mitch/Makefile.in 2007-02-14 01:59:20.000000000 -0500~~
100		+++ ~~clients/mitch/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	97	Index: moira/clients/mitch/Makefile.in
	98	===================================================================
	99	--- moira.orig/clients/mitch/Makefile.in
	100	+++ moira/clients/mitch/Makefile.in
101	101	@@ -40,7 +40,7 @@
102	102	depend:
…	…
108	108	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
109	109	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
110		Index: clients/moira/Makefile.in
111		===================================================================
112		--- ~~clients/moira/Makefile.in 2007-02-14 01:59:20.000000000 -0500~~
113		+++ ~~clients/moira/Makefile.in 2007-02-14 02:07:47.000000000 -0500~~
	110	Index: moira/clients/moira/Makefile.in
	111	===================================================================
	112	--- moira.orig/clients/moira/Makefile.in
	113	+++ moira/clients/moira/Makefile.in
114	114	@@ -44,14 +44,14 @@
115	115	depend:
…	…
135	135	moira: $(MOBJS) ../lib/libmrclient.a $(MR_LIBDEP)
136	136	$(CC) -o $@ $(LDFLAGS) $(MOBJS) $(LIBS)
137		Index: clients/mrcheck/Makefile.in
138		===================================================================
139		--- ~~clients/mrcheck/Makefile.in 2007-02-14 01:59:20.000000000 -0500~~
140		+++ ~~clients/mrcheck/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	137	Index: moira/clients/mrcheck/Makefile.in
	138	===================================================================
	139	--- moira.orig/clients/mrcheck/Makefile.in
	140	+++ moira/clients/mrcheck/Makefile.in
141	141	@@ -40,7 +40,7 @@
142	142	depend:
…	…
148	148	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
149	149	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
150		Index: clients/mrtest/Makefile.in
151		===================================================================
152		--- ~~clients/mrtest/Makefile.in 2007-02-14 01:59:21.000000000 -0500~~
153		+++ ~~clients/mrtest/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	150	Index: moira/clients/mrtest/Makefile.in
	151	===================================================================
	152	--- moira.orig/clients/mrtest/Makefile.in
	153	+++ moira/clients/mrtest/Makefile.in
154	154	@@ -40,7 +40,7 @@
155	155	depend:
…	…
161	161	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
162	162	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
163		Index: clients/stanley/Makefile.in
164		===================================================================
165		--- ~~clients/stanley/Makefile.in 2007-02-14 01:59:21.000000000 -0500~~
166		+++ ~~clients/stanley/Makefile.in 2007-02-14 01:59:59.000000000 -0500~~
	163	Index: moira/clients/stanley/Makefile.in
	164	===================================================================
	165	--- moira.orig/clients/stanley/Makefile.in
	166	+++ moira/clients/stanley/Makefile.in
167	167	@@ -40,7 +40,7 @@
168	168	depend:
…	…
174	174	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
175	175	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
176		Index: clients/stella/Makefile.in
177		===================================================================
178		--- ~~clients/stella/Makefile.in 2007-02-14 01:59:21.000000000 -0500~~
179		+++ ~~clients/stella/Makefile.in 2007-02-14 02:00:00.000000000 -0500~~
	176	Index: moira/clients/stella/Makefile.in
	177	===================================================================
	178	--- moira.orig/clients/stella/Makefile.in
	179	+++ moira/clients/stella/Makefile.in
180	180	@@ -40,7 +40,7 @@
181	181	depend:
…	…
187	187	$(TARGET): $(OBJS) ../lib/libmrclient.a $(MR_LIBDEP)
188	188	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
189		Index: man/Makefile.in
190		===================================================================
191		--- m~~an/Makefile.in 2007-02-14 01:59:21.000000000 -0500~~
192		+++ m~~an/Makefile.in 2007-02-14 02:00:00.000000000 -0500~~
	189	Index: moira/man/Makefile.in
	190	===================================================================
	191	--- moira.orig/man/Makefile.in
	192	+++ moira/man/Makefile.in
193	193	@@ -32,6 +32,7 @@
194	194	depend:
…	…
202	202	+ for m in $(MAN3); do $(INSTALL_DATA) $(srcdir)/$$m $(DESTDIR)$(mandir)/man3; done
203	203	+ for m in $(MAN8); do $(INSTALL_DATA) $(srcdir)/$$m $(DESTDIR)$(mandir)/man8; done
204		Index: update/Makefile.in
205		===================================================================
206		--- ~~update/Makefile.in 2007-02-14 01:59:21.000000000 -0500~~
207		+++ ~~update/Makefile.in 2007-02-14 02:00:00.000000000 -0500~~
	204	Index: moira/update/Makefile.in
	205	===================================================================
	206	--- moira.orig/update/Makefile.in
	207	+++ moira/update/Makefile.in
208	208	@@ -43,8 +43,8 @@
209	209	depend:
…	…
217	217	update_test: $(COBJS) $(MR_LIBDEP)
218	218	$(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS)
	219	diff -ur moira.orig/clients/mrtest/mrtest.c moira/clients/mrtest/mrtest.c
	220	--- moira.orig/clients/mrtest/mrtest.c 2008-08-30 18:22:14.000000000 -0400
	221	+++ moira/clients/mrtest/mrtest.c 2009-01-04 03:20:08.000000000 -0500
	222	@@ -97,8 +97,13 @@
	223	}
	224	}
	225
	226	+#ifndef __APPLE__
	227	initialize_sms_error_table();
	228	initialize_krb_error_table();
	229	+#else
	230	+ add_error_table(&et_sms_error_table);
	231	+ add_error_table(&et_krb_error_table);
	232	+#endif
	233
	234	#ifdef HAVE_READLINE
	235	/* we don't want filename completion */
	236	diff -ur moira.orig/lib/mr_init.c moira/lib/mr_init.c
	237	--- moira.orig/lib/mr_init.c 2008-08-30 18:22:14.000000000 -0400
	238	+++ moira/lib/mr_init.c 2009-01-04 03:19:06.000000000 -0500
	239	@@ -20,8 +20,15 @@
	240	if (mr_inited)
	241	return;
	242
	243	+#ifndef __APPLE__
	244	initialize_sms_error_table();
	245	initialize_krb_error_table();
	246	initialize_ureg_error_table();
	247	+#else
	248	+ add_error_table(&et_sms_error_table);
	249	+ add_error_table(&et_krb_error_table);
	250	+ add_error_table(&et_ureg_error_table);
	251	+#endif
	252	+
	253	mr_inited = 1;
	254	}

MacAthena

Navigation

Changeset 172

Legend:

trunk/fink/main/finkinfo/macathena-moira.info

trunk/fink/main/finkinfo/macathena-moira.patch

Download in other formats: