${INSTALL} -m 755 ${top_srcdir}/examples/sandbox_transfers.sh ${PREFIX}/examples/glite-lb-sandbox_transfers.sh
${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man1
${INSTALL} -m 644 ${MAN8_GZ} ${PREFIX}/share/man/man8
- sed "s/%LIBDIR%/${libdir}/" ${top_srcdir}/m4/glite_lb.m4 > glite_lb.m4
- ${INSTALL} -m 644 glite_lb.m4 ${PREFIX}/share/build/m4/
+ ${INSTALL} -m 644 ${top_srcdir}/m4/glite_lb.m4 ${PREFIX}/share/build/m4/
clean:
rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/
'lb.ws-interface' => [],
'lb.ws-test' => [ qw/gsoap:B/ ],
'lb.types' => [ qw// ],
- 'lb.harvester' => [ qw/postgresql:R/ ],
- 'lb.yaim' => [ qw/glite-yaim-core:R/ ],
+ 'lb.harvester' => [ qw// ],
+ 'lb.yaim' => [ qw/yaim_core:R/ ],
'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ],
- 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
+ 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ],
'lbjp-common.log' => [ qw/log4c/ ],
'lbjp-common.maildir' => [ qw// ],
'lbjp-common.server-bones' => [ qw// ],
'lbjp-common.trio' => [ qw/cppunit:B/ ],
- 'lbjp-common.jp-interface' => [ qw/cppunit:B/ ],
+ 'lbjp-common.jp-interface' => [ qw/cppunit:B log4c:B/ ],
'security.gss' => [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
'security.gsoap-plugin' => [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
'jobid.api-c' => [ qw/cppunit:B/ ],
'lb.yaim' => [ qw// ],
'lb.glite-LB' => [ qw/
lb.logger:R lb.server:R lb.utils:R lb.doc:R
- lb.ws-test:R lb.harvester:R lb.yaim:R
+ lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
/ ],
'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
'lbjp-common.maildir' => [ qw// ],
jpclient => 'jp.client',
);
+%obsoletes = (
+ 'lb.yaim' => [ qq/glite-yaim-lb/ ],
+);
+
my @t = qw/lb.client-java jobid.api-java lb.types/;
@topbuild{@t} = (1) x ($#t+1);
}
my %aux;
undef %aux;
my @m=qw/
-lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim
+lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim lb.glite-LB
security.gss security.gsoap-plugin
jobid.api-c jobid.api-cpp jobid.api-java
lbjp-common.db lbjp-common.log lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
glite_version=>'glite-version',
glite_info_templates=>'glite-info-templates',
glue_schema=>'glue-schema',
+ yaim_core=>'org.glite.yaim.core',
);
%etics_projects = (
vdt=>[qw/globus globus_essentials/],
- 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema/],
+ 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
);
};
install = make install
clean = make clean
test = make check
-configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts
+configure = cd $confdir && /usr/bin/perl \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts
checkstyle = None
[Platform-default:Property]
$buildroot
$package_description
$package_summary
+};
+ for (@{$obsoletes{"$subsys.$module"}}) {
+ print C "package.obsoletes = $_\n";
+ print C "package.replaces = $_\n";
+ }
+ print C qq{
[Platform-default:DynamicDependency]
-
};
for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) {
my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_;
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+
if test ! -z "$FAKE"; then
SUFFIX="_fake"
+++ /dev/null
-dnl Usage:
-dnl AC_GLITE_LB
-dnl - GLITE_LB_THR_CLIENT_LIBS
-dnl - GLITE_LB_THR_CLIENTPP_LIBS
-dnl - GLITE_LB_THR_COMMON_LIBS
-dnl - GLITE_LB_NOTHR_CLIENT_LIBS
-dnl - GLITE_LB_NOTHR_CLIENTPP_LIBS
-dnl - GLITE_LB_NOTHR_COMMON_LIBS
-dnl - GLITE_STATIC_LB_NOTHR_CLIENT_LIBS
-dnl - GLITE_STATIC_LB_NOTHR_COMMON_LIBS
-
-AC_DEFUN([AC_GLITE_LB],
-[
- ac_glite_lb_prefix=$GLITE_LOCATION
-
- AC_SEC_GSOAP_PLUGIN
-
- if test -n "ac_glite_lb_prefix" ; then
- dnl
- dnl
- dnl
- ac_glite_lb_lib="-L$ac_glite_lb_prefix/%LIBDIR%"
- GLITE_LB_THR_CLIENT_LIBS="$ac_glite_lb_lib -lglite_lb_client_$GLOBUS_THR_FLAVOR"
- GLITE_LB_THR_CLIENTPP_LIBS="$ac_glite_lb_lib -lglite_lb_clientpp_$GLOBUS_THR_FLAVOR"
- GLITE_LB_THR_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common_$GLOBUS_THR_FLAVOR $SEC_GSOAP_PLUGIN_GSS_THR_LIBS"
- GLITE_LB_NOTHR_CLIENT_LIBS="$ac_glite_lb_lib -lglite_lb_client_$GLOBUS_NOTHR_FLAVOR"
- GLITE_LB_NOTHR_CLIENTPP_LIBS="$ac_glite_lb_lib -lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR"
- GLITE_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common_$GLOBUS_NOTHR_FLAVOR $SEC_GSOAP_PLUGIN_GSS_NOTHR_LIBS"
- GLITE_STATIC_LB_NOTHR_CLIENT_LIBS="$ac_glite_lb_prefix/%LIBDIR%/libglite_lb_client_$GLOBUS_NOTHR_FLAVOR.a"
- GLITE_STATIC_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_prefix/%LIBDIR%/libglite_lb_common_$GLOBUS_NOTHR_FLAVOR.a $SEC_GSOAP_PLUGIN_GSS_STATIC_NOTHR_LIBS"
- ifelse([$2], , :, [$2])
- else
- GLITE_LB_THR_CLIENT_LIBS=""
- GLITE_LB_THR_CLIENTPP_LIBS=""
- GLITE_LB_THR_COMMON_LIBS=""
- GLITE_LB_NOTHR_CLIENT_LIBS=""
- GLITE_LB_NOTHR_CLIENTPP_LIBS=""
- GLITE_LB_NOTHR_COMMON_LIBS=""
- GLITE_STATIC_LB_NOTHR_CLIENT_LIBS=""
- GLITE_STATIC_LB_NOTHR_COMMON_LIBS=""
- ifelse([$3], , :, [$3])
- fi
-
- AC_SUBST(GLITE_LB_THR_CLIENT_LIBS)
- AC_SUBST(GLITE_LB_THR_CLIENTPP_LIBS)
- AC_SUBST(GLITE_LB_THR_COMMON_LIBS)
- AC_SUBST(GLITE_LB_NOTHR_CLIENT_LIBS)
- AC_SUBST(GLITE_LB_NOTHR_CLIENTPP_LIBS)
- AC_SUBST(GLITE_LB_NOTHR_COMMON_LIBS)
- AC_SUBST(GLITE_STATIC_LB_NOTHR_CLIENT_LIBS)
- AC_SUBST(GLITE_STATIC_LB_NOTHR_COMMON_LIBS)
-])
-
-AC_DEFUN([GLITE_CHECK_LB_CLIENT],
-[AC_MSG_CHECKING([for org.glite.lb.client])
-save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $GLITE_CPPFLAGS"
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS $GLITE_LDFLAGS -L$GLOBUS_LOCATION/lib"
-save_LIBS=$LIBS
-
-AC_LANG_PUSH([C])
-
-# prepare the test program, to link against the different combinations
-# of globus flavours
-
-AC_LANG_CONFTEST(
- [AC_LANG_PROGRAM(
- [@%:@include "glite/lb/consumer.h"],
- [edg_wll_QueryEvents(
- (edg_wll_Context)0,
- (const edg_wll_QueryRec*)0,
- (const edg_wll_QueryRec*)0,
- (edg_wll_Event**)0
- );]
- )]
-)
-
-LIBS="-lglite_lb_client_$GLOBUS_THR_FLAVOR $LIBS"
-AC_LINK_IFELSE([],
- [AC_SUBST([GLITE_LB_CLIENT_THR_LIBS], [-lglite_lb_client_$GLOBUS_THR_FLAVOR])],
- [AC_MSG_ERROR([cannot find org.glite.lb.client ($GLOBUS_THR_FLAVOR)])]
-)
-LIBS=$save_LIBS
-
-LIBS="-lglite_lb_client_$GLOBUS_NOTHR_FLAVOR $LIBS"
-AC_LINK_IFELSE([],
- [AC_SUBST([GLITE_LB_CLIENT_NOTHR_LIBS], [-lglite_lb_client_$GLOBUS_NOTHR_FLAVOR])],
- [AC_MSG_ERROR([cannot find org.glite.lb.client ($GLOBUS_NOTHR_FLAVOR)])]
-)
-LIBS=$save_LIBS
-
-AC_LANG_POP([C])
-
-AC_LANG_PUSH([C++])
-
-# prepare the test program, to link against the different combinations
-# of globus flavours
-
-AC_LANG_CONFTEST(
- [AC_LANG_PROGRAM(
- [@%:@include "glite/lb/Job.h"],
- [glite::lb::Job job;]
- )]
-)
-
-save_LIBS=$LIBS
-LIBS="-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR $LIBS"
-AC_LINK_IFELSE([],
- [AC_SUBST([GLITE_LB_CLIENTPP_THR_LIBS], [-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR])],
- [AC_MSG_ERROR([cannot find org.glite.lb.client (C++ - $GLOBUS_THR_FLAVOR)])]
-)
-LIBS=$save_LIBS
-
-LIBS="-lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR $LIBS"
-AC_LINK_IFELSE([],
- [AC_SUBST([GLITE_LB_CLIENTPP_NOTHR_LIBS], [-lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR])],
- [AC_MSG_ERROR([cannot find org.glite.lb.client (C++ - $GLOBUS_NOTHR_FLAVOR)])]
-)
-LIBS=$save_LIBS
-
-AC_LANG_POP([C++])
-
-LDFLAGS="$save_LDFLAGS"
-CPPFLAGS=$save_CPPFLAGS
-
-AC_MSG_RESULT([yes])
-
-])
4.0.3-2
- install libraries into $libdir
+4.0.4-1
+- Connection pool lock optimization and fixes
+- Rare crash fixes in notify example
+
+4.0.5-1
+- Compatibility with IPv6 compliant clients
+
+4.0.6-1
+- Install glite_lb.m4 rather than glite_lb_client.m4
+
+4.0.7-1
+- hard-coded 'lib' fixed in glite_lb.m4
+
4.1.0-1
- Support for CREAM jobs
- Support for logging sandbox transfers as jobs of a specific type
'lb.harvester' => [ qw// ],
'lb.yaim' => [ qw/yaim_core:R/ ],
'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ],
- 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
+ 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ],
'lbjp-common.log' => [ qw/log4c/ ],
'lbjp-common.maildir' => [ qw// ],
'lbjp-common.server-bones' => [ qw// ],
'lb.yaim' => [ qw// ],
'lb.glite-LB' => [ qw/
lb.logger:R lb.server:R lb.utils:R lb.doc:R
- lb.ws-test:R lb.harvester:R lb.yaim:R
+ lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
/ ],
'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
'lbjp-common.maildir' => [ qw// ],
7.0.4-2
- Buildtime dependency on c-ares
+7.0.5-1
+- Comments for common event fields
+- Locking in connPool initiation
+
+7.0.6-1
+- Remove glite_lb_common.m4 (replaced by glite_lb.m4 from lb.client)
+
7.1.0-1
- Advanced Autorization
7.1.1-1
- Broader authorization policy format
+
'lb.yaim' => [ qw// ],
'lb.glite-LB' => [ qw/
lb.logger:R lb.server:R lb.utils:R lb.doc:R
- lb.ws-test:R lb.harvester:R lb.yaim:R
+ lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
/ ],
'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
'lbjp-common.maildir' => [ qw// ],
1.0.3-1
- Updates to the User Guide, Admin Guide and Test Plan Test Suite Documentation
+1.0.4-1
+- Admin Guide updates - installation and migration
+- Test Plan updates
+
1.1.0-1
- Documentation updated to follow development
'lb.harvester' => [ qw// ],
'lb.yaim' => [ qw/yaim_core:R/ ],
'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ],
- 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
+ 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ],
'lbjp-common.log' => [ qw/log4c/ ],
'lbjp-common.maildir' => [ qw// ],
'lbjp-common.server-bones' => [ qw// ],
'lb.yaim' => [ qw// ],
'lb.glite-LB' => [ qw/
lb.logger:R lb.server:R lb.utils:R lb.doc:R
- lb.ws-test:R lb.harvester:R lb.yaim:R
+ lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
/ ],
'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
'lbjp-common.maildir' => [ qw// ],
2.0.4-2
- install libraries into $libdir
+2.0.6-1
+- Pidfiles support in daemons
+
+2.0.7-1
+- Startup script fixes
+
+2.0.8-1
+- Compatibility with IPv6 compliant clients
+
2.1.0-1
- Compliance with the Common Logging Format
- Fixed startup script (Savannah Bug #29081)
struct event_queue *eq;
char *p,*s, c;
+ p = strrchr(server_name, ':');
+
+ if(p)
+ *p++ = 0;
+
if((eq = malloc(sizeof(*eq))) == NULL) {
set_error(IL_NOMEM, ENOMEM, "event_queue_create: error allocating event queue");
return(NULL);
stop_daemon "glite-lb-notif-interlogd" $NOTIF_IL_PIDFILE
stop_daemon "glite-lb-bkserverd" $BK_PIDFILE
- if test x"$GLITE_LB_EXPORT_ENABLED" = x"true"; then
- stop_daemon "glite-jp-importer" $jp_importer_pidfile
- fi
+ stop_daemon "glite-jp-importer" $jp_importer_pidfile
stop_daemon "glite-lb-interlogd" $PROXY_IL_PIDFILE
'lb.yaim' => [ qw// ],
'lb.glite-LB' => [ qw/
lb.logger:R lb.server:R lb.utils:R lb.doc:R
- lb.ws-test:R lb.harvester:R lb.yaim:R
+ lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
/ ],
'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
'lbjp-common.maildir' => [ qw// ],
2.0.3-2
- Rebuild with lb.state-machine 1.0.2-1
----
-Crystal ball:
+2.0.3-3
+- install libraries into $libdir
+- buildtime dependency pn c-ares
+
2.0.4-1
- Consider arch libdir when linking c-ares
- Checking the c-ares version, fix for c-ares >= 1.5.0.
2.0.5-1
- Reflect updates in the database module
-- Adjusted grey job purges (purge undefined jobs etc.)
+- Adjusted grey job purges
+- Purge undefined or unknown jobs
-2.0.3-3
-- install libraries into $libdir
-- buildtime dependency on c-ares
+2.0.6-1
+- Fixed collection state with cancelled subjobs
+
+2.0.7-1
+- Starting proxy support
+- Fixed collection state with cancelled subjobs
+
+2.0.7-2
+- Rebuild with gridsite 1.5.10.5-3
+
+2.0.8-1
+- Startup script fixes
+
+2.0.9-1
+- Compatibility with IPv6 compliant clients
2.1.0-1
- Advanced Autorization (used by LCAS plugin too, old configuration file not supported anymore)
See the License for the specific language governing permissions and
limitations under the License.
*/
-
+#ident "$Header$"
#include <inttypes.h>
#include <stdio.h>
'lb.ws-interface' => [],
'lb.ws-test' => [ qw/gsoap:B/ ],
'lb.types' => [ qw// ],
- 'lb.harvester' => [ qw/postgresql:R/ ],
- 'lb.yaim' => [ qw/glite-yaim-core:R/ ],
+ 'lb.harvester' => [ qw// ],
+ 'lb.yaim' => [ qw/yaim_core:R/ ],
'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ],
- 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
+ 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ],
'lbjp-common.log' => [ qw/log4c/ ],
'lbjp-common.maildir' => [ qw// ],
'lbjp-common.server-bones' => [ qw// ],
'lb.yaim' => [ qw// ],
'lb.glite-LB' => [ qw/
lb.logger:R lb.server:R lb.utils:R lb.doc:R
- lb.ws-test:R lb.harvester:R lb.yaim:R
+ lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
/ ],
'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
'lbjp-common.maildir' => [ qw// ],
jpclient => 'jp.client',
);
+%obsoletes = (
+ 'lb.yaim' => [ qq/glite-yaim-lb/ ],
+);
+
my @t = qw/lb.client-java jobid.api-java lb.types/;
@topbuild{@t} = (1) x ($#t+1);
}
my %aux;
undef %aux;
my @m=qw/
-lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim
+lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim lb.glite-LB
security.gss security.gsoap-plugin
jobid.api-c jobid.api-cpp jobid.api-java
lbjp-common.db lbjp-common.log lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
glite_version=>'glite-version',
glite_info_templates=>'glite-info-templates',
glue_schema=>'glue-schema',
+ yaim_core=>'org.glite.yaim.core',
);
%etics_projects = (
vdt=>[qw/globus globus_essentials/],
- 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema/],
+ 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
);
};
install = make install
clean = make clean
test = make check
-configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts
+configure = cd $confdir && /usr/bin/perl \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts
checkstyle = None
[Platform-default:Property]
$buildroot
$package_description
$package_summary
+};
+ for (@{$obsoletes{"$subsys.$module"}}) {
+ print C "package.obsoletes = $_\n";
+ print C "package.replaces = $_\n";
+ }
+ print C qq{
[Platform-default:DynamicDependency]
-
};
for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) {
my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_;
- Support for CREAM jobs
- Type comments made complete
+1.0.2-1
+- Fix build with binary version of this module
+# $Header$
module.version=1.1.0
module.age=1
'lb.yaim' => [ qw// ],
'lb.glite-LB' => [ qw/
lb.logger:R lb.server:R lb.utils:R lb.doc:R
- lb.ws-test:R lb.harvester:R lb.yaim:R
+ lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
/ ],
'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
'lbjp-common.maildir' => [ qw// ],
1.0.1-3
- Module repacked
+1.0.2-1
+- Flavor libdir in Makefile
+
1.1.0-1
- Primitive AGU compatibility
1.1.1-1
- LB 4 AGU fixes
- Updated WS error handling
-
git://scientific.zcu.cz / jra1mw.git / commitdiff